From 92d0cf73df170131eba84490d875bc954eb7a708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 20:41:58 +0800
Subject: [PATCH] 报名考试修改

---
 src/views/dispatch/dispatchChildoperable.vue |   89 +++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d42a35b..cf1bf5f 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -1,8 +1,9 @@
 <template>
-  <div class="dispatchChildoperable">
-    <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs> -->
-    <!-- <span v-if="typeTABS.prop === 'tab1'"> -->
-    <!-- <avue-crud
+  <basic-container>
+    <div class="dispatchChildoperable">
+      <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs> -->
+      <!-- <span v-if="typeTABS.prop === 'tab1'"> -->
+      <!-- <avue-crud
         :option="option"
         :data="data"
         :page.sync="page"
@@ -28,28 +29,28 @@
           </el-button>
         </template>
       </avue-crud> -->
-    <!-- <avue-form ref="form" v-model="obj0" :option="option0"> -->
-    <!-- <template slot-scope="scope" slot="menuForm">
+      <!-- <avue-form ref="form" v-model="obj0" :option="option0"> -->
+      <!-- <template slot-scope="scope" slot="menuForm">
           <el-button @click="tip">自定义按钮</el-button>
         </template> -->
-    <!-- </avue-form>
+      <!-- </avue-form>
     </span>
     <span v-else-if="typeTABS.prop === 'tab2'"> -->
-    <avue-crud
-      :option="option1"
-      :data="data1"
-      :page.sync="page1"
-      ref="crudrec1"
-      :table-loading="loading1"
-      @row-save="rowSave1"
-      @search-change="searchChange1"
-      @search-reset="searchReset1"
-      @row-update="rowUpdate1"
-      @row-del="rowDel1"
-      @selection-change="selectionChange1"
-      @refresh-change="refreshChange1"
-    >
-      <!-- <template slot="menuLeft">
+      <avue-crud
+        :option="option1"
+        :data="data1"
+        :page.sync="page1"
+        ref="crudrec1"
+        :table-loading="loading1"
+        @row-save="rowSave1"
+        @search-change="searchChange1"
+        @search-reset="searchReset1"
+        @row-update="rowUpdate1"
+        @row-del="rowDel1"
+        @selection-change="selectionChange1"
+        @refresh-change="refreshChange1"
+      >
+        <!-- <template slot="menuLeft">
           <el-button
             type="danger"
             size="small"
@@ -59,10 +60,11 @@
             >删 除
           </el-button>
         </template> -->
-    </avue-crud>
-    <!-- </span> -->
-    <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
-  </div>
+      </avue-crud>
+      <!-- </span> -->
+      <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
+    </div>
+  </basic-container>
 </template> 
 
 <script>
@@ -198,8 +200,8 @@
           {
             label: "派遣单位",
             prop: "dispatcherCompany",
-            addDisplay: false,
-            editDisplay: false,
+            // addDisplay: false,
+            // editDisplay: false,
           },
           // {
           //   label: "派遣单位",
@@ -227,14 +229,9 @@
           {
             label: "保安公司",
             prop: "deptId",
-            labelWidth: 120,
-            searchLabelWidth: 120,
             search: true,
-            overHidden: true,
-            type: "tree",
-            searchSpan: 5,
-            cascaderItem: ["name"],
-            // cascaderItem: ["city", "area"],
+            type: "select",
+            cascaderItem: ["securityName"],
             props: {
               label: "title",
               value: "id",
@@ -249,19 +246,17 @@
             ],
           },
           {
-            width: 120,
             label: "保安员",
-            prop: "name",
-            labelWidth: 120,
-            type: "tree",
+            prop: "securityName",
+            type: "select",
             search: true,
-            searchSpan: 5,
-            cell: true,
+            // cell: true,
+            // hide: true,
             props: {
               label: "realName",
               value: "id",
             },
-            dicUrl: `/api/blade-user/page-security-unit?deptId={{deptId}}`,
+            dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
             rules: [
               {
                 required: true,
@@ -270,6 +265,7 @@
               },
             ],
           },
+
           // {
           //   width: 120,
           //   label: "保安人名称",
@@ -342,7 +338,7 @@
             format: "yyyy-MM-dd hh:mm:ss",
             valueFormat: "yyyy-MM-dd hh:mm:ss",
             labelWidth: 120,
-            searchSpan: 4,
+            searchSpan: 5,
             // search: true,
             overHidden: true,
             rules: [
@@ -370,7 +366,7 @@
               },
             ],
             // search: true,
-            // searchSpan: 5,
+            // searchSpan: 4,
             // overHidden: true
           },
           {
@@ -381,7 +377,7 @@
             valueFormat: "yyyy-MM-dd",
             searchValue: [this.getStartTime(), this.getEndTime()],
             searchRange: true,
-            searchSpan: 5,
+            searchSpan: 4,
             hide: true,
             addDisplay: false,
             editDisplay: false,
@@ -766,8 +762,9 @@
         const data = res.data.data;
         this.page1.total = data.total;
         this.data1 = data.records;
-        console.log(this.data1, 1);
+        console.log(this.data1, 1111111111111111111111111);
         this.loading1 = false;
+        this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
       });
     },
     //派遣记录

--
Gitblit v1.9.3