2022.9.16

src/views/customer/customer.vue

@@ -10,7 +10,7 @@
             <div>
               <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
 
-              <Button style="margin-left: 10px" type="primary">查询</Button>
+              <Button style="margin-left: 10px" type="primary" @click="getCustomers">查询</Button>
               <Button style="margin-left: 10px" type="primary"
                       @click="$refs['addCustomer'].type = 'add',$refs['addCustomer'].isShow = true">录入客户
               </Button>
@@ -57,6 +57,11 @@ export default {
       total: 0,
       list: [],
       tableItem: [
+        {
+          width: 40,
+          type:'index',
+          fixed:'left'
+        },
         {
           prop: "name",
           label: "姓名",

src/views/dashboard/index.vue

@@ -1,13 +1,16 @@
 <template>
-  <div class="dashboard-editor-container">
+  <div>
+    <div>
+
+    </div>
 
   </div>
 </template>
 
 <script>
   export default {
-    name: 'DashboardAdmin',
     components: {
+
     },
     data() {
       return {
@@ -22,17 +25,5 @@
 </script>
 
 <style lang="scss" scoped>
-  .dashboard-editor-container {
-    padding: 32px;
-    background-color: rgb(240, 242, 245);
-    position: relative;
 
-
-  }
-
-  @media (max-width:1024px) {
-    .chart-wrapper {
-      padding: 8px;
-    }
-  }
 </style>

src/views/finance/collectMoney.vue

@@ -6,7 +6,7 @@
         <slot>
           <div>
             <Input v-model="select.keyword" placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-left: 10px" type="primary">查询</Button>
+            <Button style="margin-left: 10px" type="primary" @click="getList">查询</Button>
             <Button style="margin-left: 10px" type="primary" @click="$refs['addcollectMoney'].type = 'add',$refs['addcollectMoney'].isShow = true">新建</Button>
           </div>
         </slot>

src/views/finance/component/addcollectMoney.vue

@@ -4,21 +4,85 @@
       ref="dialog"
       :is-show.sync="isShow"
       type="form"
-      :title="type === 'add' ? '新增' : '编辑'"
+      :title="type === 'add' ? '新增收款单' : '编辑收款单'"
       :form="form"
       :rules="rules"
       @submit="submit">
-      <template v-slot:name>
+      <template v-slot:pay_name>
         <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.name" clearable placeholder="请输入分类名称" style="width: 300px;"></el-input>
+            <el-input v-model="form.pay_name" clearable placeholder="请输入付款方" style="width: 300px;"></el-input>
           </div>
         </div>
       </template>
 
+      <template v-slot:money>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>金额：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :controls="false" :precision="2" v-model="form.money" clearable placeholder="请输入金额" style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:invoice_type>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>发票类型：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.invoice_type" style="width: 300px" placeholder="请选择发票类型">
+              <el-option v-for="item in [{label:'无',value:0},{label:'服务类发票',value:1}]" :label="item.label" :value="item.value" :key="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:date >
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>收款单日期：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              placeholder="请选择收款单日期"
+              value-format="yyyy-MM-dd"
+              v-model="form.date"
+              style="width: 300px;"></el-date-picker>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:status >
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>付款状态：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.status " style="width: 300px" placeholder="请选择付款状态">
+              <el-option v-for="item in [{label:'未付款',value:0},{label:'部分付款',value:1},{label:'已付清',value:2}]" :label="item.label" :value="item.value" :key="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:schedule_links >
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>排班信息：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.schedule_links " style="width: 300px" placeholder="请选择排班信息">
+
+            </el-select>
+          </div>
+        </div>
+      </template>
     </xy-dialog>
   </div>
 </template>
@@ -33,11 +97,16 @@ export default {
       type:'',
 
       form:{
-        name:'',
+        pay_name:'',
+        money:'',
+        invoice_type:'',
+        date:'',
+        status:'',
+        schedule_links:'',
       },
       rules:{
-        name:[
+        pay_name:[
-          {required:true,message:'请填写名称'}
+          {required:true,message:'请填写付款方'}
         ]
       }
     }

src/views/finance/salaryList.vue

@@ -6,7 +6,7 @@
         <slot>
           <div>
             <Input v-model="select.keyword" placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-left: 10px" type="primary">查询</Button>
+            <Button style="margin-left: 10px" type="primary" @click="getList">查询</Button>
           </div>
         </slot>
       </lx-header>

src/views/finance/serveDetail.vue

@@ -6,7 +6,7 @@
         <slot>
           <div>
             <Input v-model="select.keyword" placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-left: 10px" type="primary">查询</Button>
+            <Button style="margin-left: 10px" type="primary" @click="getList">查询</Button>
           </div>
         </slot>
       </lx-header>

src/views/order/order.vue

@@ -116,6 +116,10 @@ export default {
               <div style={{'color':statusColor.get(row.status)}}>{statusName.get(row.status)}</div>
             )
           }
+        },
+        {
+          label:'收款单',
+          width: 140
         }
       ]
     }

src/views/product/productManage.vue

@@ -7,7 +7,7 @@
           <slot>
             <div>
               <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-              <Button style="margin-left: 10px" type="primary">查询</Button>
+              <Button style="margin-left: 10px" type="primary" @click="getList">查询</Button>
               <Button style="margin-left: 10px" type="primary"
                       @click="$refs['addProduct'].type = 'add',$refs['addProduct'].isShow = true">新建产品
               </Button>
@@ -75,23 +75,58 @@ export default {
           prop:'purchase_price',
           label:'采购单价',
           align:'right',
-          width: 200
+          width: 200,
+          formatter:(cell,data,value)=>{
+            if(value){
+              return value
+            }else{
+              return '可变'
+            }
+          }
         },
         {
           prop:'nurse_price',
-          label:'护工服务单价',
+          label:'护工结算单价',
           align:'right',
-          width:200
+          width:200,
+          formatter:(cell,data,value)=>{
+            if(value){
+              return value
+            }else{
+              return '可变'
+            }
+          }
         },
         {
           prop:'time_lenth',
           label:'单次时长',
-          width: 160
+          width: 160,
+          formatter:(cell,data,value)=>{
+            if(value){
+              return value
+            }else{
+              return '可变'
+            }
+          }
         },
         {
-          prop:'',
           label:'服务菜单明细',
-          minWidth:220
+          minWidth:220,
+          customFn:(row)=>{
+            return (
+              <div>{row.product_skus.length}项</div>
+            )
+          }
+        },
+        {
+          prop:'type',
+          label:'单次规定项目',
+          width: 180,
+          customFn:(row)=>{
+            return (
+              <div style={{'color':row.type === 1 ? 'green' : 'blue'}}>{row.type === 1 ? '自由组合' : '按订单组合'}</div>
+            )
+          }
         }
       ]
     }

src/views/product/sku.vue

@@ -6,7 +6,7 @@
         <slot>
           <div>
             <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-left: 10px" type="primary">查询</Button>
+            <Button style="margin-left: 10px" type="primary" @click="getSku">查询</Button>
             <Button style="margin-left: 10px" type="primary" @click="$refs['addSku'].type = 'add',$refs['addSku'].isShow = true">新建服务</Button>
           </div>
         </slot>

src/views/product/skuType.vue

@@ -6,7 +6,7 @@
         <slot>
           <div>
             <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-left: 10px" type="primary">查询</Button>
+            <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>
           </div>

src/views/schedule/schedule.vue

@@ -8,7 +8,7 @@
             <el-tag effect="dark" style="margin-right: 10px;" type="warning">应排客户</el-tag>
             <el-tag effect="dark" style="margin-right: 10px;" type="success">已排客户</el-tag>
             <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-            <Button style="margin-right: 10px" type="primary">查询</Button>
+            <Button style="margin-right: 10px" type="primary" @click="getCustomers">查询</Button>
             <xy-selectors>
 
             </xy-selectors>
@@ -134,10 +134,26 @@ export default {
         //     )
         //   }
         // },
+        {
+          width: 40,
+          type:'index',
+          fixed:'left'
+        },
         {
           prop: 'name',
           label: '客户',
           width: 180,
+          fixed:'left'
+        },
+        {
+          label:'产品',
+          width: 200,
+          align:'left',
+          customFn:(row)=>{
+            return (
+              <div>{row.orders[0]?.product.name}</div>
+            )
+          }
         },
         {
           prop: '',

src/views/worker/component/addWorker.vue

@@ -387,6 +387,7 @@ export default {
     async getDetail() {
       const res = await getForm(this.id)
       this.$integrateData(this.form, res)
+      this.form.avatar = res.upload.url
     },
     submit() {
       if (this.type === 'editor') {

src/views/worker/worker.vue

@@ -8,7 +8,7 @@
           <slot>
             <div>
               <Input placeholder="关键字搜索" style="width: 200px; margin-right: 10px"/>
-              <Button style="margin-left: 10px" type="primary">查询</Button>
+              <Button style="margin-left: 10px" type="primary" @click="getWorkers">查询</Button>
               <Button style="margin-left: 10px" type="primary"
                       @click="$refs['addWorker'].type = 'add',$refs['addWorker'].isShow = true">创建护工
               </Button>
@@ -75,6 +75,14 @@ export default {
           label: "身份证号",
           width: 230
         },
+        {
+          label:'年龄',
+          customFn:(row)=>{
+            return (
+              <div>{new Date().getFullYear() - new Date(row.birthday).getFullYear()}</div>
+            )
+          }
+        },
         {
           prop: 'mobile',
           label: "联系电话",