From f753f534a4945a1a7a23935216251c063a9cc324 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Oct 2022 15:27:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E5=B1=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppOrganizationChange/components/List.vue | 10 +++---
 .../components/history.vue                    |  5 +--
 .../components/moment.vue                     | 34 ++++++++++++++++---
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/project/pingchang/apps/AppOrganizationChange/components/List.vue b/project/pingchang/apps/AppOrganizationChange/components/List.vue
index 41980a50..ad91c1b7 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/List.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/List.vue
@@ -37,8 +37,6 @@
 import {mapState} from 'vuex'
 import moment from './moment.vue'
 import history from './history.vue'
-import Template from '../../../../../packages/work/AppAskForm/components/Template.vue'
-
 
 export default {
   name: 'List',
@@ -83,7 +81,6 @@ export default {
   components: {
     moment,
     history,
-    Template
   },
   computed: {
     ...mapState(['user']),
@@ -164,7 +161,12 @@ export default {
       this.$router.push({query: {id}})
     },
     toAdd(id) {
-      this.$router.push({query: {id}, hash: "#add"})
+      this.$emit('change', {
+        type: 'addChange',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
 }
diff --git a/project/pingchang/apps/AppOrganizationChange/components/history.vue b/project/pingchang/apps/AppOrganizationChange/components/history.vue
index a101fce5..0ca881e5 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/history.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/history.vue
@@ -15,7 +15,7 @@
         class="detail-table__table"
         :tableData="tableData"
         :col-configs="colConfigs"
-        :total="totalJob"
+        :total="page.total"
         :current.sync="current"
         :size.sync="size"
         @getList="getJobList">
@@ -74,6 +74,7 @@ export default {
 
 <style lang="scss" scope>
 .history {
-  
+  padding-top: 0 !important;
+  background-color: #FFF !important;
 }
 </style>
\ No newline at end of file
diff --git a/project/pingchang/apps/AppOrganizationChange/components/moment.vue b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
index b8008cce..d1399223 100644
--- a/project/pingchang/apps/AppOrganizationChange/components/moment.vue
+++ b/project/pingchang/apps/AppOrganizationChange/components/moment.vue
@@ -53,6 +53,31 @@
         </el-table-column>
       </ai-table>
     </template>
+
+    <ai-dialog :visible.sync="dialogJob" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
+      <el-form ref="jobForm" size="small" :model="jobForm" :rules="rules" label-width="80px">
+        <el-form-item label="职位" prop="title">
+          <el-input v-model="jobForm.title" clearable placeholder="请输入"/>
+        </el-form-item>
+        <el-form-item label="姓名" prop="dv">
+          <el-input v-model="jobForm.title" clearable placeholder="请输入"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+
+    <ai-dialog :visible.sync="dialogCandidate" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
+      <el-form ref="CandFrom" size="small" :model="CandFrom" :rules="rules" label-width="80px">
+        <el-form-item label="大屏标题" prop="title">
+          <el-input v-model="custom.title" clearable placeholder="请填写"/>
+        </el-form-item>
+        <el-form-item label="选择大屏" prop="dv">
+          <ai-select v-model="custom.dv" :selectList="dict.getDict('customizedDVs')"/>
+        </el-form-item>
+        <el-form-item label="静态数据">
+          <el-input type="textarea" rows="5" v-model="custom.meta"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
   </ai-list>
 </template>
 
@@ -72,6 +97,8 @@ export default {
       totalJob: 0,
       current: 1,
       size: 10,
+      dialogJob: false,
+      dialogCandidate: false,
     }
   },
   computed: {
@@ -94,6 +121,7 @@ export default {
           id: id || ''
         }
       })
+      // this.$route.push('#addChange')
     },
   }
 }
@@ -102,10 +130,6 @@ export default {
 <style lang="scss" scope>
 .moment {
   padding-top: 0 !important;
-  .btn {}
-
-  ::v-deep .ai-list .ai-list__single .ai-list__content {
-    padding: 0;
-  }
+  background-color: #FFF !important;
 }
 </style>
\ No newline at end of file