Merge remote-tracking branch 'origin/master'

src/views/handleAffairs/gridType/index.vue

@@ -116,7 +116,7 @@
           <el-input v-model="form.name" placeholder="请输入名称" maxlength="20"/>
         </el-form-item>
         <el-form-item label="岗位描述" prop="jobDescription">
-          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="255"/>
+          <el-input v-model="form.jobDescription" placeholder="请输入岗位描述" maxlength="255" type="textarea" rows="4"/>
         </el-form-item>
         <el-form-item label="图片路径" prop="fileUrl">
           <image-upload v-model="form.fileUrl" :fileSize="10" :limit="1"/>

src/views/highServer/assistance/index.vue

@@ -257,7 +257,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除帮扶救助编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此条数据项？').then(function () {
         return delServer(ids);
       }).then(() => {
         this.getList();

src/views/highServer/lifeServices/index.vue

@@ -257,7 +257,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除生活服务编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此条数据项？').then(function () {
         return delServer(ids);
       }).then(() => {
         this.getList();

src/views/highServer/liveBroadcast/index.vue

@@ -257,7 +257,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除直播带货编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此条数据项？').then(function () {
         return delServer(ids);
       }).then(() => {
         this.getList();

src/views/highServer/onlineConsultation/index.vue

@@ -257,7 +257,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除线上问诊编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此条数据项？').then(function () {
         return delServer(ids);
       }).then(() => {
         this.getList();

src/views/highServer/psychologicalCounseling/index.vue

@@ -257,7 +257,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除心理咨询编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此条数据项？').then(function () {
         return delServer(ids);
       }).then(() => {
         this.getList();

src/views/highServer/travelGuide/index.vue

@@ -257,7 +257,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除旅游向导编号为"' + ids + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除此条数据项？').then(function () {
         return delServer(ids);
       }).then(() => {
         this.getList();