From 8ad07bd89eea15ea8ff9e0408616db290a96b131 Mon Sep 17 00:00:00 2001 From: wanglizhong <wlz> Date: 星期四, 01 五月 2025 10:13:54 +0800 Subject: [PATCH] feat:上传客户配置 --- ruoyi-ui/src/views/system/serviceOrder/index.vue | 146 ++++++++++++++++-------------------------------- 1 files changed, 49 insertions(+), 97 deletions(-) diff --git a/ruoyi-ui/src/views/system/order/order.vue b/ruoyi-ui/src/views/system/serviceOrder/index.vue similarity index 67% rename from ruoyi-ui/src/views/system/order/order.vue rename to ruoyi-ui/src/views/system/serviceOrder/index.vue index 4d530eb..c1f36e4 100644 --- a/ruoyi-ui/src/views/system/order/order.vue +++ b/ruoyi-ui/src/views/system/serviceOrder/index.vue @@ -1,19 +1,28 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> - <el-form-item label="璁㈠崟ID" prop="serviceOrdId"> + <el-form-item label="璁㈠崟缂栧彿" prop="serviceOrdId"> <el-input v-model="queryParams.serviceOrdId" - placeholder="璇疯緭鍏ヨ鍗旾D" + placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable size="small" @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="鐥呬汉濮撳悕" prop="serviceOrdPtName"> + <el-form-item label="鎮h�呭鍚�" prop="serviceOrdPtName"> <el-input v-model="queryParams.serviceOrdPtName" - placeholder="璇疯緭鍏ョ梾浜哄鍚�" + placeholder="璇疯緭鍏ユ偅鑰呭鍚�" + clearable + size="small" + @keyup.enter.native="handleQuery" + /> + </el-form-item> + <el-form-item label="鑱旂郴鐢佃瘽" prop="serviceOrdCoPhone"> + <el-input + v-model="queryParams.serviceOrdCoPhone" + placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable size="small" @keyup.enter.native="handleQuery" @@ -22,24 +31,12 @@ <el-form-item label="璁㈠崟鐘舵��" prop="serviceOrdState"> <el-select v-model="queryParams.serviceOrdState" placeholder="璇烽�夋嫨璁㈠崟鐘舵��" clearable size="small"> <el-option - v-for="dict in dict.type.sys_order_state" + v-for="dict in dict.type.sys_order_status" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> - </el-form-item> - <el-form-item label="寮�濮嬫棩鏈�"> - <el-date-picker - v-model="dateRange" - size="small" - style="width: 240px" - value-format="yyyy-MM-dd" - type="daterange" - range-separator="-" - start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡" - ></el-date-picker> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> @@ -95,23 +92,21 @@ <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="璁㈠崟ID" align="center" prop="serviceOrdId" /> - <el-table-column label="鐥呬汉濮撳悕" align="center" prop="serviceOrdPtName" /> - <el-table-column label="鐥呬汉骞撮緞" align="center" prop="serviceOrdPtAge" /> - <el-table-column label="鐥呬汉鎬у埆" align="center" prop="serviceOrdPtSex" /> + <el-table-column label="璁㈠崟缂栧彿" align="center" prop="serviceOrdId" /> + <el-table-column label="鑱旂郴浜�" align="center" prop="serviceOrdCoName"/> + <el-table-column label="鎮h�呭鍚�" align="center" prop="serviceOrdPtName"/> + <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="serviceOrdCoPhone"/> + <el-table-column label="鎮h�呮�у埆" align="center" prop="serviceOrdPtSex"/> + <el-table-column label="鍑哄彂鏃堕棿" align="center" prop="serviceOrdStartDate" /> + <el-table-column label="鐩殑鍦板潃" align="center" prop="serviceOrdTraEnd" /> <el-table-column label="璁㈠崟鐘舵��" align="center" prop="serviceOrdState"> <template slot-scope="scope"> - <dict-tag :options="dict.type.sys_order_state" :value="scope.row.serviceOrdState"/> + <dict-tag :options="dict.type.sys_order_status" :value="scope.row.serviceOrdState"/> </template> </el-table-column> - <el-table-column label="寮�濮嬫棩鏈�" align="center" prop="serviceOrdStartDate" width="180"> + <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"> <template slot-scope="scope"> - <span>{{ parseTime(scope.row.serviceOrdStartDate, '{y}-{m}-{d}') }}</span> - </template> - </el-table-column> - <el-table-column label="棰勭害鏃ユ湡" align="center" prop="serviceOrdApptDate" width="180"> - <template slot-scope="scope"> - <span>{{ parseTime(scope.row.serviceOrdApptDate, '{y}-{m}-{d}') }}</span> + <span>{{ parseTime(scope.row.createTime) }}</span> </template> </el-table-column> <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> @@ -145,50 +140,30 @@ <!-- 娣诲姞鎴栦慨鏀规湇鍔¤鍗曞璇濇 --> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> - <el-form-item label="鐥呬汉濮撳悕" prop="serviceOrdPtName"> - <el-input v-model="form.serviceOrdPtName" placeholder="璇疯緭鍏ョ梾浜哄鍚�" /> + <el-form-item label="鎮h�呭鍚�" prop="serviceOrdPtName"> + <el-input v-model="form.serviceOrdPtName" placeholder="璇疯緭鍏ユ偅鑰呭鍚�" /> </el-form-item> - <el-form-item label="鐥呬汉骞撮緞" prop="serviceOrdPtAge"> - <el-input v-model="form.serviceOrdPtAge" placeholder="璇疯緭鍏ョ梾浜哄勾榫�" /> + <el-form-item label="鑱旂郴鐢佃瘽" prop="serviceOrdCoPhone"> + <el-input v-model="form.serviceOrdCoPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item> - <el-form-item label="鐥呬汉鎬у埆" prop="serviceOrdPtSex"> - <el-select v-model="form.serviceOrdPtSex" placeholder="璇烽�夋嫨鐥呬汉鎬у埆"> - <el-option - v-for="dict in dict.type.sys_user_sex" - :key="dict.value" - :label="dict.label" - :value="dict.value" - ></el-option> - </el-select> + <el-form-item label="鍑哄彂鍦板潃" prop="serviceOrdTraStreet"> + <el-input v-model="form.serviceOrdTraStreet" placeholder="璇疯緭鍏ュ嚭鍙戝湴鍧�" /> + </el-form-item> + <el-form-item label="鐩殑鍦板潃" prop="serviceOrdTraEnd"> + <el-input v-model="form.serviceOrdTraEnd" placeholder="璇疯緭鍏ョ洰鐨勫湴鍧�" /> </el-form-item> <el-form-item label="璁㈠崟鐘舵��" prop="serviceOrdState"> <el-select v-model="form.serviceOrdState" placeholder="璇烽�夋嫨璁㈠崟鐘舵��"> <el-option - v-for="dict in dict.type.sys_order_state" + v-for="dict in dict.type.sys_order_status" :key="dict.value" :label="dict.label" :value="dict.value" ></el-option> </el-select> </el-form-item> - <el-form-item label="寮�濮嬫棩鏈�" prop="serviceOrdStartDate"> - <el-date-picker - v-model="form.serviceOrdStartDate" - type="datetime" - placeholder="閫夋嫨寮�濮嬫棩鏈�" - value-format="yyyy-MM-dd HH:mm:ss" - /> - </el-form-item> - <el-form-item label="棰勭害鏃ユ湡" prop="serviceOrdApptDate"> - <el-date-picker - v-model="form.serviceOrdApptDate" - type="datetime" - placeholder="閫夋嫨棰勭害鏃ユ湡" - value-format="yyyy-MM-dd HH:mm:ss" - /> - </el-form-item> - <el-form-item label="璁㈠崟澶囨敞" prop="serviceOrdUnitRemarks"> - <el-input v-model="form.serviceOrdUnitRemarks" type="textarea" placeholder="璇疯緭鍏ヨ鍗曞娉�" /> + <el-form-item label="澶囨敞" prop="serviceOrdUnitRemarks"> + <el-input v-model="form.serviceOrdUnitRemarks" type="textarea" placeholder="璇疯緭鍏ュ娉�" /> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> @@ -204,7 +179,7 @@ export default { name: "Order", - dicts: ['sys_order_state', 'sys_user_sex'], + dicts: ['sys_order_status'], data() { return { // 閬僵灞� @@ -225,14 +200,13 @@ title: "", // 鏄惁鏄剧ず寮瑰嚭灞� open: false, - // 鏃ユ湡鑼冨洿 - dateRange: [], // 鏌ヨ鍙傛暟 queryParams: { pageNum: 1, pageSize: 10, serviceOrdId: null, serviceOrdPtName: null, + serviceOrdCoPhone: null, serviceOrdState: null }, // 琛ㄥ崟鍙傛暟 @@ -240,22 +214,19 @@ // 琛ㄥ崟鏍¢獙 rules: { serviceOrdPtName: [ - { required: true, message: "鐥呬汉濮撳悕涓嶈兘涓虹┖", trigger: "blur" } + { required: true, message: "鎮h�呭鍚嶄笉鑳戒负绌�", trigger: "blur" } ], - serviceOrdPtAge: [ - { required: true, message: "鐥呬汉骞撮緞涓嶈兘涓虹┖", trigger: "blur" } + serviceOrdCoPhone: [ + { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" } ], - serviceOrdPtSex: [ - { required: true, message: "鐥呬汉鎬у埆涓嶈兘涓虹┖", trigger: "change" } + serviceOrdTraStreet: [ + { required: true, message: "鍑哄彂鍦板潃涓嶈兘涓虹┖", trigger: "blur" } + ], + serviceOrdTraEnd: [ + { required: true, message: "鐩殑鍦板潃涓嶈兘涓虹┖", trigger: "blur" } ], serviceOrdState: [ { required: true, message: "璁㈠崟鐘舵�佷笉鑳戒负绌�", trigger: "change" } - ], - serviceOrdStartDate: [ - { required: true, message: "寮�濮嬫棩鏈熶笉鑳戒负绌�", trigger: "blur" } - ], - serviceOrdApptDate: [ - { required: true, message: "棰勭害鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" } ] } }; @@ -267,7 +238,7 @@ /** 鏌ヨ鏈嶅姟璁㈠崟鍒楄〃 */ getList() { this.loading = true; - listOrder(this.addDateRange(this.queryParams, this.dateRange)).then(response => { + listOrder(this.queryParams).then(response => { this.orderList = response.rows; this.total = response.total; this.loading = false; @@ -282,29 +253,11 @@ reset() { this.form = { serviceOrdId: null, - serviceOrdUserID: null, - serviceOrdClass: null, - serviceOrdType: null, - serviceOrdState: null, - serviceOrdStartDate: null, - serviceOrdApptDate: null, - serviceOrdCoName: null, - serviceOrdCoPhone: null, serviceOrdPtName: null, - serviceOrdPtAge: null, - serviceOrdPtSex: null, - serviceOrdPtKG: null, - serviceOrdPtNat: null, - serviceOrdPtIDCard: null, - serviceOrdTraProvince: null, - serviceOrdTraCity: null, + serviceOrdCoPhone: null, serviceOrdTraStreet: null, serviceOrdTraEnd: null, - serviceOrdTraDistance: null, - serviceOrdTraUnitPrice: null, - serviceOrdTraTxnPrice: null, - serviceOrdTraPaidType: null, - serviceOrdTraPaidPrice: null, + serviceOrdState: null, serviceOrdUnitRemarks: null }; this.resetForm("form"); @@ -316,7 +269,6 @@ }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { - this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, -- Gitblit v1.9.1