Forráskód Böngészése

订单管理已经摄像头管理添加人员ID和电话号码

yanliming 5 éve
szülő
commit
4ba51b87c5

+ 13 - 1
src/views/base/cameraInfo-detail.vue

@@ -46,6 +46,12 @@
         <el-form-item label="所在房间" prop="roomAddress">
           <el-input v-model="formModel.roomAddress" placeholder="请输入所在房间" style="width:300px"></el-input>
         </el-form-item>
+        <el-form-item label="人员ID" prop="personId">
+          <el-input v-model="formModel.personId" placeholder="请输入人员ID" style="width:300px"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="contactPhone">
+          <el-input v-model="formModel.contactPhone" placeholder="请输入人员ID" style="width:300px"></el-input>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -82,7 +88,13 @@ export default {
         ],
         classify: [
           { required: true, message: "设备分类", trigger: "blur" },
-        ]
+        ],
+        personId: [
+          { required: true, message: "人员ID不能为空", trigger: "blur" },
+        ],
+        contactPhone: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
       },
       showDialog: true,
       loading: false,

+ 5 - 0
src/views/base/cameraInfo-list.vue

@@ -137,6 +137,11 @@
         label="验证码"
         width="100"
       ></el-table-column>
+      <el-table-column
+        prop="personId"
+        label="人员ID"
+        width="100"
+      ></el-table-column>
       <el-table-column
         prop="contactPhone"
         label="联系电话"

+ 12 - 6
src/views/base/order-list.vue

@@ -44,13 +44,13 @@
                 <el-form-item label="姓名" prop="name">
                     <el-input v-model="queryModel.name" size="mini" style="width:150px;"/>
                 </el-form-item>
-                <el-form-item label="所属单位" prop="schoolId">
-                    <el-select v-model="queryModel.schoolId" 
+                <el-form-item label="所属单位" prop="companyId">
+                    <el-select v-model="queryModel.companyId" 
                     filterable
                     clearable
                     placeholder="请选择" size="mini" style="width:150px;">
                         <el-option
-                            v-for="item in schoolList"
+                            v-for="item in companyList"
                             :key="item.id"
                             :label="item.name"
                             :value="item.id"
@@ -234,6 +234,7 @@
 import Constant from "@/constant";
 import orderApi from '@/api/base/order'
 import goodsInfoApi from "@/api/base/goodsInfo";
+import companyInfoApi from "@/api/base/companyInfo";
 import orderDetail from "./order-detail";
 import { getToken } from "@/utils/auth"; // get token from cookie
 import pageUtil from "@/utils/page";
@@ -246,13 +247,13 @@ export default {
                 name:"",
                 goodName:"",
                 goodTypeId:"",
-                schoolId:"",
+                companyId:"",
                 payStatus:"",
                 outOrderNo:"",
                 createTimeRanges:"",
                 transactionId:"",
             },
-            schoolList:[],
+            companyList:[],
             goodTypeList:[],
             statusList:[{
                 label:"未支付",
@@ -308,7 +309,7 @@ export default {
             formData.append("outOrderNo", this.queryModel.outOrderNo);
             formData.append("payStatus", this.queryModel.payStatus);
             formData.append("name", this.queryModel.name);
-            formData.append("schoolId", this.queryModel.schoolId);
+            formData.append("companyId", this.queryModel.companyId);
             formData.append("createTimeRanges", this.queryModel.createTimeRanges);
             formData.append("transactionId", this.queryModel.transactionId);
 
@@ -566,6 +567,11 @@ export default {
     created() {
         var self = this;
 
+        companyInfoApi.list().then(response => {
+            var jsonData = response.data;
+            this.companyList = jsonData.data;
+        });
+
         goodsInfoApi.goodsTypeList().then(response => {
             var jsonData = response.data;
             this.goodTypeList = jsonData.data;