Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/views/grassrootsregistration/bdglequip/index.vue

@@ -23,21 +23,13 @@
         </el-select>
       </el-form-item>
       <el-form-item label="" prop="granttime">
-        <!-- <el-date-picker
-          v-model="queryParams.granttime"
-          type="date"
-          :editable="false"
-          placeholder="选择日期"
-         @change="item"
-        >
-        </el-date-picker> -->
         <el-date-picker
           clearable
           size="small"
           v-model="queryParams.granttime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择召开时间"
+          placeholder="选择配发时间"
           @change="item"
           :editable="false"
         >
@@ -115,18 +107,11 @@
       <el-table-column label="配发单位" align="center" prop="unitName1" />
       <el-table-column label="配发时间" align="center" prop="granttime" />
       <el-table-column label="配发数量" align="center" prop="grantnum" />
-      <!-- <el-table-column label="自筹数量" align="center" prop="ownnum" /> -->
       <el-table-column label="库存数量" align="center" prop="stocknum" />
       <el-table-column label="入库时间" align="center" prop="intime" />
       <el-table-column label="入库数量" align="center" prop="innum" />
-      <!-- <el-table-column label="入库经手人" align="center" prop="peopleId" /> -->
       <el-table-column label="出库时间" align="center" prop="outtime" />
       <el-table-column label="出库数量" align="center" prop="outnum" />
-      <!-- <el-table-column label="出库经手人" align="center" prop="peopleId1" />
-      <el-table-column label="质量情况" align="center" prop="quality" /> -->
-      <!-- <el-table-column label="备注" align="center" prop="info" /> -->
-      <!-- <el-table-column label="操作时间" align="center" prop="createtime" />
-      <el-table-column label="操作人" align="center" prop="adminId" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -258,7 +243,7 @@
             type="date"
             :editable="false"
             value-format="yyyy-MM-dd"
-            placeholder="选择配发时间"
+            placeholder="选择入库时间"
           >
           </el-date-picker>
         </el-form-item>
@@ -290,7 +275,7 @@
             type="date"
             :editable="false"
             value-format="yyyy-MM-dd"
-            placeholder="选择配发时间"
+            placeholder="选择出库时间"
           >
           </el-date-picker>
         </el-form-item>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -307,7 +307,6 @@ import { quillEditor } from "vue-quill-editor";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { treeselect } from "@/api/system/dept";
 
 export default {
   name: "Bdgleven",

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -18,512 +18,6 @@
         </div>
       </el-col>
       <el-col :span="20" :xs="24">
-        <!-- <el-form
-          :model="queryParams"
-          ref="queryForm"
-          :inline="true"
-          v-show="showSearch"
-          label-width="68px"
-        >
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入姓名"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item> -->
-        <!-- <el-form-item label="年龄" prop="age">
-        <el-input
-          v-model="queryParams.age"
-          placeholder="请输入年龄"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出生年月" prop="birthDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.birthDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择出生年月">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="命令号" prop="command">
-        <el-input
-          v-model="queryParams.command"
-          placeholder="请输入命令号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部职别" prop="duty">
-        <el-input
-          v-model="queryParams.duty"
-          placeholder="请输入部职别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职务" prop="postId">
-        <el-input
-          v-model="queryParams.postId"
-          placeholder="请输入职务"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="等级" prop="gradeId">
-        <el-input
-          v-model="queryParams.gradeId"
-          placeholder="请输入等级"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职务等级时间" prop="postDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.postDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择职务等级时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="工作岗位" prop="job">
-        <el-input
-          v-model="queryParams.job"
-          placeholder="请输入工作岗位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术职务" prop="skillId">
-        <el-input
-          v-model="queryParams.skillId"
-          placeholder="请输入技术职务"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术职务时间" prop="skillDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.skillDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择技术职务时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="技术等级" prop="levelId">
-        <el-input
-          v-model="queryParams.levelId"
-          placeholder="请输入技术等级"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="技术等级时间" prop="levelDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.levelDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择技术等级时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="军人证号" prop="military">
-        <el-input
-          v-model="queryParams.military"
-          placeholder="请输入军人证号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="idcard">
-        <el-input
-          v-model="queryParams.idcard"
-          placeholder="请输入身份证号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入伍年月" prop="enlistDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.enlistDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择入伍年月">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入伍地点" prop="enlistaddress">
-        <el-input
-          v-model="queryParams.enlistaddress"
-          placeholder="请输入入伍地点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="军衔" prop="rankId">
-        <el-input
-          v-model="queryParams.rankId"
-          placeholder="请输入军衔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="军衔时间" prop="rankDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.rankDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择军衔时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="民族" prop="nationId">
-        <el-input
-          v-model="queryParams.nationId"
-          placeholder="请输入民族"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="籍贯" prop="origin">
-        <el-input
-          v-model="queryParams.origin"
-          placeholder="请输入籍贯"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="人员类别" prop="classId">
-        <el-input
-          v-model="queryParams.classId"
-          placeholder="请输入人员类别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="学历" prop="educationId">
-        <el-input
-          v-model="queryParams.educationId"
-          placeholder="请输入学历"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="学位" prop="degreeId">
-        <el-input
-          v-model="queryParams.degreeId"
-          placeholder="请输入学位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="毕业时间" prop="graduationDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.graduationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择毕业时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="毕业院校" prop="school">
-        <el-input
-          v-model="queryParams.school"
-          placeholder="请输入毕业院校"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="党团情况" prop="partyId">
-        <el-input
-          v-model="queryParams.partyId"
-          placeholder="请输入党团情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="党团时间" prop="partyDate">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.partyDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择党团时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="简历名称" prop="readmeFileName">
-        <el-input
-          v-model="queryParams.readmeFileName"
-          placeholder="请输入简历名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部别" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入部别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="照片" prop="avatar">
-        <el-input
-          v-model="queryParams.avatar"
-          placeholder="请输入照片"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="出生地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入出生地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号码" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入手机号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="0在位，1调出" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择0在位，1调出" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="0在位，1调出" prop="createtimes">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.createtimes"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择0在位，1调出">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="0在位，1调出" prop="updatetimes">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.updatetimes"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择0在位，1调出">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="0在位，1休假，2出差,3借调，4学习，5执行任务,6外诊，7其他" prop="reign">
-        <el-input
-          v-model="queryParams.reign"
-          placeholder="请输入0在位，1休假，2出差,3借调，4学习，5执行任务,6外诊，7其他"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工作时间" prop="jobTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.jobTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择工作时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="健康情况" prop="healthy">
-        <el-input
-          v-model="queryParams.healthy"
-          placeholder="请输入健康情况"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="血型" prop="bloodType">
-        <el-select v-model="queryParams.bloodType" placeholder="请选择血型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="职务时间" prop="postTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.postTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择职务时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="专业" prop="major">
-        <el-input
-          v-model="queryParams.major"
-          placeholder="请输入专业"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入学时间" prop="admissionTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.admissionTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择入学时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="手机型号" prop="mobilePhoneModel">
-        <el-input
-          v-model="queryParams.mobilePhoneModel"
-          placeholder="请输入手机型号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="保障卡号" prop="guaranteeCardNo">
-        <el-input
-          v-model="queryParams.guaranteeCardNo"
-          placeholder="请输入保障卡号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工资卡号" prop="payrollCardNo">
-        <el-input
-          v-model="queryParams.payrollCardNo"
-          placeholder="请输入工资卡号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="家庭住址" prop="live">
-        <el-input
-          v-model="queryParams.live"
-          placeholder="请输入家庭住址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门ID" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="现军衔" prop="nowMilitaryRank">
-        <el-input
-          v-model="queryParams.nowMilitaryRank"
-          placeholder="请输入现军衔"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="待遇级别" prop="treatmentLevel">
-        <el-input
-          v-model="queryParams.treatmentLevel"
-          placeholder="请输入待遇级别"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="现待遇级别时间" prop="rankUpgradeTime">
-        <el-date-picker clearable size="small"
-          v-model="queryParams.rankUpgradeTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择现待遇级别时间">
-        </el-date-picker>
-          </el-form-item>-->
-        <!-- <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form> -->
-
-        <!-- <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['peopleManage:people:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['peopleManage:people:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['peopleManage:people:remove']"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              :loading="exportLoading"
-              @click="handleExport"
-              v-hasPermi="['peopleManage:people:export']"
-            >导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row> -->
-
         <el-table
           v-loading="loading"
           :data="peopleList"
@@ -654,97 +148,6 @@
             prop="school"
             width="120"
           />
-          <!-- <el-table-column label="党团情况" align="center" prop="partyId">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.Caucus" :value="scope.row.partyId" />
-            </template>
-          </el-table-column>
-          <el-table-column label="党团时间" align="center" prop="partyDate" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.partyDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="培训经历" align="center" prop="training" />
-          <el-table-column label="简历" align="center" prop="readmeFile" />
-          <el-table-column label="简历名称" align="center" prop="readmeFileName" />
-          <el-table-column label="奖惩情况" align="center" prop="prize" />
-          <el-table-column label="婚姻情况" align="center" prop="marryList">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.marryList" :value="scope.row.marryList" />
-            </template>
-          </el-table-column>
-          <el-table-column label="子女情况" align="center" prop="childrenList">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_yw" :value="scope.row.childrenList" />
-            </template>
-          </el-table-column>
-          <el-table-column label="部别" align="center" prop="unitId" />
-          <el-table-column label="照片" align="center" prop="avatar" />
-          <el-table-column label="出生地址" align="center" prop="address" />
-          <el-table-column label="手机号码" align="center" prop="phone" />
-          <el-table-column label="0在位，1调出" align="center" prop="status" />
-          <el-table-column label="0在位，1调出" align="center" prop="createtimes" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createtimes, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="0在位，1调出" align="center" prop="updatetimes" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.updatetimes, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="0在位，1休假，2出差,3借调，4学习，5执行任务,6外诊，7其他" align="center" prop="reign" />
-          <el-table-column label="工作时间" align="center" prop="jobTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="健康情况" align="center" prop="healthy">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.healthy" :value="scope.row.healthy" />
-            </template>
-          </el-table-column>
-          <el-table-column label="血型" align="center" prop="bloodType">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.bloodType" :value="scope.row.bloodType" />
-            </template>
-          </el-table-column>
-          <el-table-column label="职务时间" align="center" prop="postTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.postTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="专业" align="center" prop="major" />
-          <el-table-column label="入学时间" align="center" prop="admissionTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.admissionTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="手机型号" align="center" prop="mobilePhoneModel" />
-          <el-table-column label="保障卡号" align="center" prop="guaranteeCardNo" />
-          <el-table-column label="工资卡号" align="center" prop="payrollCardNo" />
-          <el-table-column label="是否纳编" align="center" prop="authorizedStrength">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.authorizedStrength" />
-            </template>
-          </el-table-column>
-          <el-table-column label="专业是否对口" align="center" prop="aboral" />
-          <el-table-column label="家庭住址" align="center" prop="live" />
-          <el-table-column label="部门ID" align="center" prop="deptId" />
-          <el-table-column label="用户ID" align="center" prop="userId" />
-          <el-table-column label="现军衔" align="center" prop="nowMilitaryRank">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.nowMilitaryRank" />
-            </template>
-          </el-table-column>
-          <el-table-column label="待遇级别" align="center" prop="treatmentLevel" />
-          <el-table-column label="现待遇级别时间" align="center" prop="rankUpgradeTime" width="180">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.rankUpgradeTime, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="部门名称" align="center" prop="deptName" />
-          <el-table-column label="备用手机号" align="center" prop="phoneStandby" />-->
           <el-table-column
             label="操作"
             align="center"