From 81b605c25bccbd858d4698e9586ebbca16264c93 Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Fri, 21 Oct 2022 14:02:16 +0800
Subject: [PATCH] 2022.10.21

---
 .env.development                             | 4 ++--
 src/views/customer/component/addCustomer.vue | 7 +++----
 src/views/customer/customer.vue              | 2 +-
 src/views/finance/salaryList.vue             | 4 +++-
 src/views/finance/serveDetail.vue            | 4 +++-
 src/views/order/objects.vue                  | 4 +++-
 src/views/product/productManage.vue          | 2 +-
 src/views/product/sku.vue                    | 6 ++++--
 src/views/product/skuType.vue                | 2 +-
 src/views/schedule/schedule.vue              | 4 +++-
 src/views/worker/notice.vue                  | 4 +++-
 src/views/worker/worker.vue                  | 9 +++++----
 12 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/.env.development b/.env.development
index d7cdd09..4639f42 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = http://sstt.ali251.langye.net/
-#VUE_APP_BASE_API = https://sstt.115.langye.net
+#VUE_APP_BASE_API = http://sstt.ali251.langye.net/
+VUE_APP_BASE_API = https://sstt.115.langye.net
 VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file
diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue
index cd9f3d0..8e0d2cb 100644
--- a/src/views/customer/component/addCustomer.vue
+++ b/src/views/customer/component/addCustomer.vue
@@ -68,10 +68,10 @@
       <template v-slot:contact_phone>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>委托人手机号：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>委托人电话：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.contact_phone " clearable placeholder="请输入委托人手机号" style="width: 300px;"></el-input>
+            <el-input v-model="form.contact_phone " clearable placeholder="请输入委托人电话" style="width: 300px;"></el-input>
           </div>
         </div>
       </template>
@@ -502,8 +502,7 @@ export default {
           {required: true, message: '请填写联系人姓名'}
         ],
         contact_phone: [
-          {required: true, message: '请填写手机号'},
-          {pattern: /^[1][3-9][\d]{9}/, message: '手机号格式错误'}
+          {validator: validatePhone}
         ],
         idcard_address: [
           {required: true, message: '请填写户籍地址'},
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index 17c96bd..a31cc09 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -8,7 +8,7 @@
 
           <slot>
             <div>
-              <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
+              <Input placeholder="关键字搜索" v-model="select.keyword" style="width: 200px; margin-right: 10px"/>
 
               <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getCustomers()">查询</Button>
               <Button style="margin-left: 10px" type="primary"
diff --git a/src/views/finance/salaryList.vue b/src/views/finance/salaryList.vue
index f453931..8c46e76 100644
--- a/src/views/finance/salaryList.vue
+++ b/src/views/finance/salaryList.vue
@@ -25,7 +25,9 @@
       row-key="name"
       :total="total"
       :list="list"
-      :table-item="table">
+      :table-item="table"
+      @pageSizeChange="e => select.page_size = e"
+      @pageIndexChange="e => {select.page = e;getList()}">
       <template v-slot:btns>
         <div></div>
       </template>
diff --git a/src/views/finance/serveDetail.vue b/src/views/finance/serveDetail.vue
index 854e29d..f6c823e 100644
--- a/src/views/finance/serveDetail.vue
+++ b/src/views/finance/serveDetail.vue
@@ -15,7 +15,9 @@
     <xy-table
       :total="total"
       :list="list"
-      :table-item="table">
+      :table-item="table"
+      @pageSizeChange="e => select.page_size = e"
+      @pageIndexChange="e => {select.page = e;getList()}">
       <template v-slot:btns>
         <el-table-column fixed="right" label="操作" width="68" header-align="center" align="center">
           <template v-slot:default="scope">
diff --git a/src/views/order/objects.vue b/src/views/order/objects.vue
index 81148ca..53ae6eb 100644
--- a/src/views/order/objects.vue
+++ b/src/views/order/objects.vue
@@ -18,7 +18,9 @@
       :list="list"
       :table-item="table"
       @editor="editor"
-      @delete="destroy"></xy-table>
+      @delete="destroy"
+      @pageSizeChange="e => select.page_size = e"
+      @pageIndexChange="e => {select.page = e;getList()}"></xy-table>
 
     <add ref="addobjects" @refresh="getList" :types="types" :areas="areas"/>
   </div>
diff --git a/src/views/product/productManage.vue b/src/views/product/productManage.vue
index 0f36d69..d18fe7f 100644
--- a/src/views/product/productManage.vue
+++ b/src/views/product/productManage.vue
@@ -6,7 +6,7 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
+<!--              <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>-->
               <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getList()">查询</Button>
               <Button style="margin-left: 10px" type="primary"
                       @click="$refs['addProduct'].type = 'add',$refs['addProduct'].isShow = true">新建产品
diff --git a/src/views/product/sku.vue b/src/views/product/sku.vue
index e960cae..53923c8 100644
--- a/src/views/product/sku.vue
+++ b/src/views/product/sku.vue
@@ -5,7 +5,7 @@
         <div slot="content"></div>
         <slot>
           <div>
-            <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
+<!--            <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>-->
             <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getSku()">查询</Button>
             <Button style="margin-left: 10px" type="primary" @click="$refs['addSku'].type = 'add',$refs['addSku'].isShow = true">新建服务</Button>
           </div>
@@ -18,7 +18,9 @@
       :list="list"
       :table-item="table"
       @editor="editor"
-      @delete="destroy"></xy-table>
+      @delete="destroy"
+      @pageSizeChange="e => select.page_size = e"
+      @pageIndexChange="e => {select.page = e;getSku()}"></xy-table>
 
     <add-sku ref="addSku" :skuType="types" @refresh="getSku"></add-sku>
   </div>
diff --git a/src/views/product/skuType.vue b/src/views/product/skuType.vue
index c14e6a5..4a50aef 100644
--- a/src/views/product/skuType.vue
+++ b/src/views/product/skuType.vue
@@ -5,7 +5,7 @@
         <div slot="content"></div>
         <slot>
           <div>
-            <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
+<!--            <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>-->
             <Button style="margin-left: 10px" type="primary" @click="getSkuType">查询</Button>
             <Button style="margin-left: 10px" type="primary" @click="$refs['addSkuType'].type = 'add',$refs['addSkuType'].isShow = true">新建分类
             </Button>
diff --git a/src/views/schedule/schedule.vue b/src/views/schedule/schedule.vue
index c2b11f4..d348f82 100644
--- a/src/views/schedule/schedule.vue
+++ b/src/views/schedule/schedule.vue
@@ -53,7 +53,9 @@
       :default-expand-all="false"
       :list="list"
       :table-item="table"
-      :total="total">
+      :total="total"
+      @pageSizeChange="e => select.page_size = e"
+      @pageIndexChange="e => {select.page = e;getCustomerList()}">
       <template v-slot:btns>
         <el-table-column :width="70" align="center" label="操作" fixed="right" header-align="center">
           <template v-slot:default="scope">
diff --git a/src/views/worker/notice.vue b/src/views/worker/notice.vue
index 5108885..1e21018 100644
--- a/src/views/worker/notice.vue
+++ b/src/views/worker/notice.vue
@@ -18,7 +18,9 @@
       :list="list"
       :table-item="table"
       @editor="editor"
-      @delete="destroy"></xy-table>
+      @delete="destroy"
+      @pageSizeChange="e => select.page_size = e"
+      @pageIndexChange="e => {select.page = e;getList()}"></xy-table>
 
     <add ref="addnotice" @refresh="getList" />
   </div>
diff --git a/src/views/worker/worker.vue b/src/views/worker/worker.vue
index 2635ad0..6c996bd 100644
--- a/src/views/worker/worker.vue
+++ b/src/views/worker/worker.vue
@@ -7,8 +7,8 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-              <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getWorkers">查询</Button>
+              <Input placeholder="关键字搜索" v-model="select.keyword" style="width: 200px; margin-right: 10px"/>
+              <Button style="margin-left: 10px" type="primary" @click="select.page = 1,getWorkers()">查询</Button>
               <Button style="margin-left: 10px" type="primary"
                       @click="$refs['addWorker'].type = 'add',$refs['addWorker'].isShow = true">创建护工
               </Button>
@@ -25,7 +25,7 @@
       :total="total"
       @delete="destroy"
       @editor="editor"
-      @pagSizeChange="e => select.page_size = e"
+      @pageSizeChange="e => select.page_size = e"
       @pageIndexChange="e => {select.page = e;getWorkers()}"></xy-table>
 
     <add-worker
@@ -51,7 +51,8 @@ export default {
     return {
       select: {
         page: 1,
-        page_size: 10
+        page_size: 10,
+        keyword:''
       },
       serveArea: [],
       productType: [],