Merge branch 'test' of http://139.224.139.2:9091/yuzhenWang/yd-csf-front into test

src/formJson/customer.js

@@ -92,7 +92,7 @@ const customer = [
         unit: '历史客户',
         unitColor: 'rgba(0, 82, 217, 1)',
         inputType: 'text',
-        required: true,
+        required: false,
         maxLength: 30,
         disabled: false,
         placeholder: '请输入2~6位汉字',

src/views/sign/appointment/index.vue

@@ -16,7 +16,7 @@
         <el-form :model="queryParams" ref="queryRef" label-width="100px" label-position="top">
           <el-row :gutter="30">
             <el-col :sm="12" :lg="8" :xs="24">
-              <el-form-item label="确认预约时间">
+              <el-form-item label="签单日">
                 <el-date-picker
                   v-model="dateRange"
                   value-format="YYYY-MM-DD"
@@ -26,6 +26,23 @@
                   end-placeholder="结束日期"
                   @clear="clearDate"
                 ></el-date-picker>
+                <!-- <div class="timeBox">
+                  <el-date-picker
+                    v-model="queryParams.date1"
+                    type="date"
+                    aria-label="Pick a date"
+                    placeholder="开始日期"
+                    style="width: 47%"
+                  />
+                  <span style="margin: 10px">-</span>
+                  <el-date-picker
+                    v-model="queryParams.date1"
+                    type="date"
+                    aria-label="Pick a date"
+                    placeholder="结束日期"
+                    style="width: 47%"
+                  />
+                </div> -->
               </el-form-item>
             </el-col>
             <el-col :sm="12" :lg="8" :xs="24">
@@ -73,7 +90,9 @@
           >
             <template #default="scope">
               <el-button link size="default">
-                <span @click="copyToClipboard(scope.row.appointmentNo,'预约编号')">{{ scope.row.appointmentNo }}</span>
+                <span @click="copyToClipboard(scope.row.appointmentNo, '预约编号')">{{
+                  scope.row.appointmentNo
+                }}</span>
               </el-button>
             </template>
           </el-table-column>
@@ -213,7 +232,7 @@ import {
   getItineraryExprot
 } from '@/api/sign/appointment'
 import useUserStore from '@/store/modules/user'
-import {copyToClipboard} from '@/utils/copyToClipboard'
+import { copyToClipboard } from '@/utils/copyToClipboard'
 const dictStore = useDictStore()
 const userStore = useUserStore()
 const router = useRouter()
@@ -588,7 +607,6 @@ function handleUpdate(row, type) {
 }
 
 getList()
-
 </script>
 <style lang="scss" scoped>
 .app-container {
@@ -646,5 +664,12 @@ getList()
     align-items: center;
     justify-content: center;
   }
+  .timeBox {
+    display: flex;
+    width: 100%;
+    box-sizing: border-box;
+    align-items: center;
+    font-size: 0; /* 移除空格影响 */
+  }
 }
 </style>