新增

project/pingchang/apps/AppOrganizationChange/components/addChange.vue

@@ -1,7 +1,52 @@
 <template>
-  <section class="addChange">
-    新增 
-  </section>
+  <ai-list class="addChange">
+    <template #title>
+      <ai-title title="基本信息" isShowBottomBorder isShowBack  @onBackClick="back" />
+    </template>
+    <template #content>
+      <el-form ref="form" :model="form" label-width="100px" label-position="right">
+        <ai-bar title="基本信息"></ai-bar>
+        <el-row type="flex">
+          <el-col :span="12">
+            <el-form-item label="换届时间" prop="data" :rules="[{ required: true, message: '请选择换届时间', trigger: 'blur' }]">
+              <el-input size="small" :maxlength="30" placeholder="请输入大屏项目名称" v-model="form.name"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="届次" prop="noun" :rules="[{ required: true, message: '请输入届次', trigger: 'blur' }]">
+              <el-input size="small" :maxlength="30" placeholder="请输入届次" v-model="form.name"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <ai-bar title="本届任职(必填)">
+        <template slot="right">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加任职人员</el-button>
+        </template>
+      </ai-bar>
+      <ai-table
+        class="detail-table__table"
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="totalJob"
+        :current.sync="current"
+        :size.sync="size"
+        @getList="getJobList">
+        <el-table-column slot="options" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+            <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </ai-table>
+      <ai-bar title="本届候选人">
+        <template slot="right">
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toEdit('')" >添加候选人</el-button>
+        </template>
+      </ai-bar>
+    </template>
+  </ai-list>
 </template>
 
 <script>
@@ -12,6 +57,16 @@ export default {
     permissions: Function,
     dict: Object,
   },
+  data() {
+    return {
+      form: {
+
+      }
+    }
+  },
+  methods: {
+    back() {},
+  }
 }
 </script>
 

project/pingchang/apps/AppOrganizationChange/components/moment.vue

@@ -14,27 +14,7 @@
       </ai-wrapper>
       <ai-bar title="本届任职">
         <template slot="right">
-          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加任职人员</el-button>
-        </template>
-      </ai-bar>
-      <ai-table
-          class="detail-table__table"
-          :tableData="tableData"
-          :col-configs="colConfigs"
-          :total="totalJob"
-          :current.sync="current"
-          :size.sync="size"
-          @getList="getJobList">
-          <el-table-column slot="options" label="操作" align="center">
-            <template slot-scope="{ row }">
-              <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
-              <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
-            </template>
-          </el-table-column>
-        </ai-table>
-        <ai-bar title="本届候选人">
-        <template slot="right">
-          <el-button size="small" type="text" icon="iconfont iconAdd" @click="toAdd('')" >添加候选人</el-button>
+          <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogJob=true" >添加任职人员</el-button>
         </template>
       </ai-bar>
       <ai-table
@@ -52,32 +32,50 @@
           </template>
         </el-table-column>
       </ai-table>
+      <ai-bar title="本届候选人">
+      <template slot="right">
+        <el-button size="small" type="text" icon="iconfont iconAdd" @click="dialogCandidate = true" >添加候选人</el-button>
+      </template>
+      </ai-bar>
+      <ai-table
+        class="detail-table__table"
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="totalJob"
+        :current.sync="current"
+        :size.sync="size"
+        @getList="getJobList">
+        <el-table-column slot="options" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <el-button type="text" @click="jobEdit(row.id)">编辑</el-button>
+            <el-button type="text" @click="jobDelete(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </ai-table>
+      <ai-dialog :visible.sync="dialogJob" title="添加本届任职人" width="720px" @closed="jobForm={}" @onConfirm="handleJobForm">
+        <el-form ref="jobForm" size="small" :model="jobForm" :rules="jobRules" label-width="80px">
+          <el-form-item label="职位" prop="job">
+            <el-input v-model="jobForm.job" clearable placeholder="请输入"/>
+          </el-form-item>
+          <el-form-item label="姓名" prop="name">
+            <el-input v-model="jobForm.name" clearable placeholder="请输入"/>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+
+      <ai-dialog :visible.sync="dialogCandidate" title="添加本届候选人" width="720px" @closed="CandFrom={}" @onConfirm="handleCandForm">
+        <el-form ref="CandFrom" size="small" :model="CandFrom" :rules="candRules" label-width="80px">
+          <el-form-item label="职位" prop="job">
+            <el-input v-model="CandFrom.job" clearable placeholder="请输入"/>
+          </el-form-item>
+          <el-form-item label="候选人" prop="name">
+            <el-input type="textarea" rows="5" v-model="CandFrom.name" placeholder="请输入候选人姓名，用逗号隔开"/>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
     </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>
 
@@ -99,6 +97,14 @@ export default {
       size: 10,
       dialogJob: false,
       dialogCandidate: false,
+      jobForm: {
+        job: '',
+        name: '',
+      },
+      CandFrom: {
+        job: '',
+        name: '',
+      },
     }
   },
   computed: {
@@ -108,13 +114,25 @@ export default {
         {prop: 'content', label: '姓名'},
         {slot: 'options'},
       ]
+    },
+    jobRules() {
+      return {
+        job: [{required: true, message: "请输入职位"}],
+        name: [{required: true, message: "请输入姓名"}],
+      }
+    },
+    candRules() {
+      return {
+        job: [{required: true, message: "请输入职位"}],
+        name: [{required: true, message: "请输入姓名"}],
+      }
     }
   },
   methods: {
     jobEdit() {},
     jobDelete() {},
     getJobList() {},
-    toEdit() {
+    toEdit(id) {
       this.$emit('change', {
         type: 'addChange',
         params: {
@@ -123,6 +141,8 @@ export default {
       })
       // this.$route.push('#addChange')
     },
+    handleJobForm() {},
+    handleCandForm() {},
   }
 }
 </script>