Merge remote-tracking branch 'origin/master'

src/views/article-management/article-detail.vue

@@ -29,13 +29,14 @@
               style="padding-left: 13px"
             >
               <el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px">
-                <el-input v-model="form.articleTitle" disabled placeholder="请输入文章标题" />
+                <el-input v-model="form.articleTitle" disabled placeholder="暂无数据" />
               </el-form-item>
               <el-form-item label="权重" prop="articleWeight">
                 <el-input-number
                   v-model="form.articleWeight"
                   :max="9999"
                   :min="1"
+                  placeholder="暂无数据"
                   controls-position="right"
                   disabled
                 />
@@ -51,7 +52,7 @@
               <el-form-item label="状态" prop="articleStatus">
                 <div style="display: flex; ">
                   <div style="padding-right: 15px;">
-                    <el-select v-model="form.articleStatus" disabled>
+                    <el-select v-model="form.articleStatus" placeholder="暂无数据" disabled>
                       <el-option
                         v-for="({value, label}, index) in statusList"
                         :key="index"

src/views/article-management/article-insert.vue

@@ -46,8 +46,6 @@
                       />
                     </el-select>
                   </div>
-                  <!--                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>-->
-                  <!--                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>-->
                 </div>
               </el-form-item>
               <el-form-item label="文章内容" prop="articleContent">

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -29,7 +29,7 @@
         <el-input
           v-model="queryParams.phone"
           clearable
-          placeholder="手机号"
+          placeholder="请输入宠主手机号"
           @keyup.enter.native="handleQuery"
           @blur="handleQuery"
         />
@@ -48,11 +48,31 @@
     >
       <el-table-column align="center" min-width="30" reserve-selection type="selection" />
       <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
-      <el-table-column align="center" label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip />
-      <el-table-column align="center" label="手机号" min-width="80" prop="phone" show-overflow-tooltip />
-      <el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip />
-      <el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip />
-      <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip />
+      <el-table-column align="center" label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.ownerName || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="手机号" min-width="80" prop="phone" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.phone || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.membershipLevel || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.balance || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.petNickname || '-' }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column-->
       <!--        align="center"-->
       <!--        label="宠物品种"-->

src/views/service-management/registration-queue/registration-add.vue

@@ -26,12 +26,12 @@
       <el-row :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠物ID:" prop="petsId">
-            <el-input v-model="form.petsId" :disabled="true" maxlength="20" />
+            <el-input v-model="form.petsId" :placeholder="isEdit? '请输入宠物ID' : '暂无数据'" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物昵称:" prop="petNickname">
-            <el-input v-model.trim="form.petNickname" :disabled="!isEdit" maxlength="10" placeholder="请输入宠物昵称" />
+            <el-input v-model.trim="form.petNickname" :disabled="!isEdit" maxlength="10" :placeholder="isEdit? '请输入宠物昵称' : '暂无数据'" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -41,7 +41,7 @@
                 v-model="form.petBreedId"
                 :disabled="!isEdit"
                 clearable
-                placeholder="请选择宠物品种"
+                :placeholder="isEdit? '请输入主品种' : '暂无数据'"
                 style="width: 100%"
                 @change="changePetBreedId"
               >
@@ -56,7 +56,7 @@
                 v-model="form.petChildBreedId"
                 :disabled="!isEdit"
                 clearable
-                placeholder="请选择宠物品种"
+                :placeholder="isEdit? '请输入子品种' : '暂无数据'"
                 style="width: 100%"
                 class="petChildBreed"
                 @change="changePetChildBreedId"
@@ -77,7 +77,7 @@
               v-model="form.petSex"
               :disabled="!isEdit"
               clearable
-              placeholder="请选择宠物性别"
+              :placeholder="isEdit? '请选择宠物性别' : '暂无数据'"
               style="width: 100%"
             >
               <el-option
@@ -96,7 +96,7 @@
               :disabled="!isEdit"
               :picker-options="pickerOptions"
               clearable
-              placeholder="请选择宠物生日"
+              :placeholder="isEdit? '请选择宠物生日' : '暂无数据'"
               type="date"
               value-format="yyyy-MM-dd"
             />
@@ -105,14 +105,14 @@
         <el-col :span="8">
           <!--宠物体重-->
           <el-form-item label="宠物体重" prop="petWeight">
-            <el-input v-model.trim="form.petWeight" maxlength="10" :disabled="!isEdit">
+            <el-input v-model.trim="form.petWeight" :placeholder="isEdit? '请输入宠物体重' : '暂无数据'" maxlength="10" :disabled="!isEdit">
               <template #suffix>kg</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="宠物毛色:" prop="petColor">
-            <el-input v-model.trim="form.petColor" :disabled="!isEdit" maxlength="10" placeholder="请输入宠物毛色" />
+            <el-input v-model.trim="form.petColor" :disabled="!isEdit" maxlength="10" :placeholder="isEdit? '请输入宠物毛色' : '暂无数据'" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -121,7 +121,7 @@
               v-model="form.sterilizationStatus"
               :disabled="!isEdit"
               clearable
-              placeholder="请选择宠物绝育情况"
+              :placeholder="isEdit? '请选择宠物绝育情况' : '暂无数据'"
               style="width: 100%"
             >
               <el-option
@@ -139,7 +139,7 @@
               v-model="form.vaccineSituation"
               :disabled="!isEdit"
               clearable
-              placeholder="请选择宠物疫苗情况"
+              :placeholder="isEdit? '请选择疫苗情况' : '暂无数据'"
               style="width: 100%"
             >
               <el-option
@@ -157,7 +157,7 @@
               v-model="form.insure"
               :disabled="!isEdit"
               clearable
-              placeholder="请选择宠物保险情况"
+              :placeholder="isEdit? '请选择宠物保险' : '暂无数据'"
               style="width: 100%"
             >
               <el-option
@@ -178,7 +178,7 @@
       <el-row v-if="isEdit && !showPetInfo" :gutter="41">
         <el-col :span="8">
           <el-form-item label="宠主手机号:" prop="masterPhone">
-            <el-input v-model.trim="form.masterPhone" :disabled="!isEdit" maxlength="11" @blur="checkOwner" />
+            <el-input v-model.trim="form.masterPhone" :placeholder="isEdit? '请输入宠主手机号' : '暂无数据'" :disabled="!isEdit" maxlength="11" @blur="checkOwner" />
           </el-form-item>
         </el-col>
       </el-row>