Merge branch 'lings' into 'master'

机构管理员操作

See merge request !1

src/views/modules/serviceOrder/news.vue

@@ -5,6 +5,11 @@
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
+        <el-select v-model="dataForm.status"  filterable placeholder="订单状态">
+          <el-option label="未审核" value="0"></el-option>
+          <el-option label="审核通过" value="1"></el-option>
+          <el-option label="审核未通过" value="2"></el-option>
+        </el-select>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -66,7 +71,8 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
+        id: '',
+        status:''
       }
     }
   },

src/views/modules/serviceOrder/pensionorder-add-or-update.vue

 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="订单编号" prop="orderNum">
-          <el-input v-model="dataForm.orderNum" placeholder="订单编号"></el-input>
-      </el-form-item>
-          <el-form-item label="订单状态 0未接单 ，1已接单  2已完成 3已取消" prop="status">
-          <el-input v-model="dataForm.status" placeholder="订单状态 0未接单 ，1已接单  2已完成 3已取消"></el-input>
-      </el-form-item>
-          <el-form-item label="订单状态名称" prop="statusName">
+          <!--<el-form-item label="订单编号" prop="orderNum">-->
+          <!--<el-input v-model="dataForm.orderNum" placeholder="订单编号"></el-input>-->
+      <!--</el-form-item>-->
+          <!--<el-form-item label="订单状态 0未接单 ，1已接单  2已完成 3已取消" prop="status">-->
+          <!--<el-input v-model="dataForm.status" placeholder="订单状态 0未接单 ，1已接单  2已完成 3已取消"></el-input>-->
+      <!--</el-form-item>-->
+          <el-form-item label="订单状态" prop="statusName">
           <el-input v-model="dataForm.statusName" placeholder="订单状态名称"></el-input>
       </el-form-item>
           <el-form-item label="详细地址" prop="address">
           <el-input v-model="dataForm.address" placeholder="详细地址"></el-input>
       </el-form-item>
-          <el-form-item label="订单所属的服务id" prop="serviceId">
-          <el-input v-model="dataForm.serviceId" placeholder="订单所属的服务id"></el-input>
-      </el-form-item>
-          <el-form-item label="订单所属的服务名称" prop="serviceName">
+          <!--<el-form-item label="订单所属的服务id" prop="serviceId">-->
+          <!--<el-input v-model="dataForm.serviceId" placeholder="订单所属的服务id"></el-input>-->
+      <!--</el-form-item>-->
+          <el-form-item label="服务名称" prop="serviceName">
           <el-input v-model="dataForm.serviceName" placeholder="订单所属的服务名称"></el-input>
       </el-form-item>
           <el-form-item label="预约人" prop="appointmentPerson">
@@ -31,42 +31,42 @@
           <el-form-item label="备注" prop="remark">
           <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
-          <el-form-item label="接单人id" prop="orderRecipientId">
-          <el-input v-model="dataForm.orderRecipientId" placeholder="接单人id"></el-input>
-      </el-form-item>
-          <el-form-item label="接单人姓名" prop="orderRecipientName">
+          <!--<el-form-item label="接单人id" prop="orderRecipientId">-->
+          <!--<el-input v-model="dataForm.orderRecipientId" placeholder="接单人id"></el-input>-->
+      <!--</el-form-item>-->
+          <el-form-item label="服务人姓名" prop="orderRecipientName">
           <el-input v-model="dataForm.orderRecipientName" placeholder="接单人姓名"></el-input>
       </el-form-item>
-          <el-form-item label="接单时间" prop="orderRecipientTime">
+          <el-form-item label="派单时间" prop="orderRecipientTime">
           <el-input v-model="dataForm.orderRecipientTime" placeholder="接单时间"></el-input>
       </el-form-item>
-          <el-form-item label="接单人电话" prop="orderRecipientPhone">
+          <el-form-item label="服务人电话" prop="orderRecipientPhone">
           <el-input v-model="dataForm.orderRecipientPhone" placeholder="接单人电话"></el-input>
       </el-form-item>
-          <el-form-item label="订单实际金额" prop="actPrice">
-          <el-input v-model="dataForm.actPrice" placeholder="订单实际金额"></el-input>
-      </el-form-item>
+          <!--<el-form-item label="订单实际金额" prop="actPrice">-->
+          <!--<el-input v-model="dataForm.actPrice" placeholder="订单实际金额"></el-input>-->
+      <!--</el-form-item>-->
           <el-form-item label="所属社区名称" prop="communityName">
           <el-input v-model="dataForm.communityName" placeholder="所属社区名称"></el-input>
       </el-form-item>
-          <el-form-item label="所属社区id" prop="communityId">
-          <el-input v-model="dataForm.communityId" placeholder="所属社区id"></el-input>
-      </el-form-item>
-          <el-form-item label="部门ID" prop="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>
-      </el-form-item>
+          <!--<el-form-item label="所属社区id" prop="communityId">-->
+          <!--<el-input v-model="dataForm.communityId" placeholder="所属社区id"></el-input>-->
+      <!--</el-form-item>-->
+          <!--<el-form-item label="部门ID" prop="deptId">-->
+          <!--<el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>-->
+      <!--</el-form-item>-->
             <el-form-item label="订单发起人" prop="creatorName">
           <el-input v-model="dataForm.creatorName" placeholder="订单发起人"></el-input>
       </el-form-item>
           <el-form-item label="订单发起人联系电话" prop="creatorTel">
           <el-input v-model="dataForm.creatorTel" placeholder="订单发起人联系电话"></el-input>
       </el-form-item>
-            <el-form-item label="更新者" prop="updater">
-          <el-input v-model="dataForm.updater" placeholder="更新者"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updateDate">
-          <el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>
-      </el-form-item>
+            <!--<el-form-item label="更新者" prop="updater">-->
+          <!--<el-input v-model="dataForm.updater" placeholder="更新者"></el-input>-->
+      <!--</el-form-item>-->
+          <!--<el-form-item label="更新时间" prop="updateDate">-->
+          <!--<el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>-->
+      <!--</el-form-item>-->
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>