antissoft / lvqianmeiye_ERP

Commit a500b58140cfbdbc971706cf86aab203a695c291

Authored by 李宇
1 parent 18f6f115

``` 

feat(Form): 添加医美、科美、生美、健康师手工费及陪同选项

在项目表单中新增了医美手工费、科美手工费、生美手工费、健康师手工费以及是否允许陪同的相关输入项和选择项，并在数据模型中初始化默认值。同时，在列表页面增加了对应字段的展示列，支持显示相应内容及状态。
```
Inline Side-by-side
Showing 2 changed files with 58 additions and 0 deletions
antis-ncc-admin/src/views/lqXmzl/Form.vue
  View file @a500b58
... ... @@ -180,6 +180,38 @@
180 180 </el-select>
181 181 </el-form-item>
182 182 </el-col>
  183 + <el-col :span="24">
  184 + <el-form-item label="医美手工费" prop="medicalBeautyLaborCost">
  185 + <el-input type="number" v-model="dataForm.medicalBeautyLaborCost" placeholder="请输入医美手工费" clearable :style='{"width":"100%"}' >
  186 + </el-input>
  187 + </el-form-item>
  188 + </el-col>
  189 + <el-col :span="24">
  190 + <el-form-item label="科美手工费" prop="techBeautyLaborCost">
  191 + <el-input type="number" v-model="dataForm.techBeautyLaborCost" placeholder="请输入科美手工费" clearable :style='{"width":"100%"}' >
  192 + </el-input>
  193 + </el-form-item>
  194 + </el-col>
  195 + <el-col :span="24">
  196 + <el-form-item label="生美手工费" prop="lifeBeautyLaborCost">
  197 + <el-input type="number" v-model="dataForm.lifeBeautyLaborCost" placeholder="请输入生美手工费" clearable :style='{"width":"100%"}' >
  198 + </el-input>
  199 + </el-form-item>
  200 + </el-col>
  201 + <el-col :span="24">
  202 + <el-form-item label="健康师手工费" prop="healthCoachLaborCost">
  203 + <el-input type="number" v-model="dataForm.healthCoachLaborCost" placeholder="请输入健康师手工费" clearable :style='{"width":"100%"}' >
  204 + </el-input>
  205 + </el-form-item>
  206 + </el-col>
  207 + <el-col :span="24">
  208 + <el-form-item label="是否允许陪同" prop="isAllowAccompanied">
  209 + <el-select v-model="dataForm.isAllowAccompanied" placeholder="请选择">
  210 + <el-option label="否" :value="0"></el-option>
  211 + <el-option label="是" :value="1"></el-option>
  212 + </el-select>
  213 + </el-form-item>
  214 + </el-col>
183 215 </el-form>
184 216 </el-row>
185 217 <span slot="footer" class="dialog-footer">
... ... @@ -221,6 +253,11 @@ import { init } from &#39;echarts/lib/echarts&#39;;
221 253 qt2:undefined,
222 254 beautyType:undefined,
223 255 isEffective: 1, // 默认有效
  256 + medicalBeautyLaborCost: 0, // 医美手工费
  257 + techBeautyLaborCost: 0, // 科美手工费
  258 + lifeBeautyLaborCost: 0, // 生美手工费
  259 + healthCoachLaborCost: 0, // 健康师手工费
  260 + isAllowAccompanied: 0, // 是否允许陪同 0否 1是
224 261 },
225 262 rules: {
226 263 },
... ... @@ -380,6 +417,11 @@ import { init } from &#39;echarts/lib/echarts&#39;;
380 417 }).then(res =>{
381 418 this.dataForm = res.data;
382 419 this.dataForm.isEffective = res.data.isEffective?res.data.isEffective:1;
  420 + this.dataForm.medicalBeautyLaborCost = res.data.medicalBeautyLaborCost !== undefined ? res.data.medicalBeautyLaborCost : 0;
  421 + this.dataForm.techBeautyLaborCost = res.data.techBeautyLaborCost !== undefined ? res.data.techBeautyLaborCost : 0;
  422 + this.dataForm.lifeBeautyLaborCost = res.data.lifeBeautyLaborCost !== undefined ? res.data.lifeBeautyLaborCost : 0;
  423 + this.dataForm.healthCoachLaborCost = res.data.healthCoachLaborCost !== undefined ? res.data.healthCoachLaborCost : 0;
  424 + this.dataForm.isAllowAccompanied = res.data.isAllowAccompanied !== undefined ? res.data.isAllowAccompanied : 0;
383 425 })
384 426 }
385 427 })
... ...
antis-ncc-admin/src/views/lqXmzl/index.vue
  View file @a500b58
... ... @@ -202,6 +202,17 @@
202 202 <span v-else>无</span>
203 203 </template>
204 204 </el-table-column>
  205 + <el-table-column prop="medicalBeautyLaborCost" label="医美手工费" align="left" />
  206 + <el-table-column prop="techBeautyLaborCost" label="科美手工费" align="left" />
  207 + <el-table-column prop="lifeBeautyLaborCost" label="生美手工费" align="left" />
  208 + <el-table-column prop="healthCoachLaborCost" label="健康师手工费" align="left" />
  209 + <el-table-column prop="isAllowAccompanied" label="是否允许陪同" align="left">
  210 + <template slot-scope="scope">
  211 + <span v-if="scope.row.isAllowAccompanied === 1" style="color: #67C23A;">是</span>
  212 + <span v-else-if="scope.row.isAllowAccompanied === 0" style="color: #909399;">否</span>
  213 + <span v-else>无</span>
  214 + </template>
  215 + </el-table-column>
205 216 <el-table-column label="操作" fixed="right" width="100">
206 217 <template slot-scope="scope">
207 218 <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
... ... @@ -274,6 +285,11 @@
274 285 { prop: 'qt1', label: '其它1' },
275 286 { prop: 'qt2', label: '其它2' },
276 287 { prop: 'isEffective', label: '是否有效' },
  288 + { prop: 'medicalBeautyLaborCost', label: '医美手工费' },
  289 + { prop: 'techBeautyLaborCost', label: '科美手工费' },
  290 + { prop: 'lifeBeautyLaborCost', label: '生美手工费' },
  291 + { prop: 'healthCoachLaborCost', label: '健康师手工费' },
  292 + { prop: 'isAllowAccompanied', label: '是否允许陪同' },
277 293 ],
278 294 // 搜索选项数据
279 295 searchOptions1: [],
... ...