Selaa lähdekoodia

地方SV大萨

sunyanqiang 3 vuotta sitten
vanhempi
commit
6c0dec92c0

+ 16 - 0
src/api/grassrootsregistration/bdgldrill.js

@@ -50,4 +50,20 @@ export function exportBdgldrill(query) {
     method: 'get',
     params: query
   })
+}
+
+export function treeselect(query) {
+  return request({
+    url: `/grassrootsregistration/type/treeselect?parentId=${0}`,
+    method: 'get',
+    params: query
+  })
+}
+
+export function getweekwork(query) {
+  return request({
+    url: `/grassrootsregistration/bdgldrill/getweekwork?drillTime=${query}`,
+    method: 'get',
+
+  })
 }

+ 634 - 298
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -7,7 +7,27 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="" prop="address">
+      <!-- <el-form-item label="训练项目" prop="project">
+        <el-input
+          v-model="queryParams.project"
+          placeholder="请输入训练项目"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="训练时间" prop="drillTime">
+        <el-date-picker
+          clearable
+          size="small"
+          v-model="queryParams.drillTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择训练时间"
+        >
+        </el-date-picker>
+      </el-form-item> -->
+      <!-- <el-form-item label="训练地点" prop="address">
         <el-input
           v-model="queryParams.address"
           placeholder="请输入训练地点"
@@ -16,16 +36,122 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <!-- <el-button
+      <el-form-item label="应训" prop="oughtTo">
+        <el-input
+          v-model="queryParams.oughtTo"
+          placeholder="请输入应训"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文件名称" prop="filename">
+        <el-input
+          v-model="queryParams.filename"
+          placeholder="请输入文件名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文件路径" prop="filepath">
+        <el-input
+          v-model="queryParams.filepath"
+          placeholder="请输入文件路径"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="装备" prop="equipment">
+        <el-input
+          v-model="queryParams.equipment"
+          placeholder="请输入装备"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="弹药" prop="ammunition">
+        <el-input
+          v-model="queryParams.ammunition"
+          placeholder="请输入弹药"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="摩托时间" prop="mototime">
+        <el-input
+          v-model="queryParams.mototime"
+          placeholder="请输入摩托时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="训练结束时间" prop="drillEndtime">
+        <el-date-picker
+          clearable
+          size="small"
+          v-model="queryParams.drillEndtime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择训练结束时间"
+        >
+        </el-date-picker>
+      </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="trainingCategory">
+        <el-input
+          v-model="queryParams.trainingCategory"
+          placeholder="请输入训练类别"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createtime">
+        <el-date-picker
+          clearable
+          size="small"
+          v-model="queryParams.createtime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="创建人id" prop="createId">
+        <el-input
+          v-model="queryParams.createId"
+          placeholder="请输入创建人id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item>
+        <el-button
           type="primary"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
+
           >搜索</el-button
-        > -->
-        <el-button size="btr" @click="resetQuery">重置</el-button>
-      </el-form-item>
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -40,7 +166,7 @@
           >新增</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="success"
           plain
@@ -75,11 +201,11 @@
           v-hasPermi="['grassrootsregistration:bdgldrill:export']"
           >导出</el-button
         >
-      </el-col> -->
-      <!-- <right-toolbar
+      </el-col>
+      <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar> -->
+      ></right-toolbar>
     </el-row>
 
     <el-table
@@ -89,18 +215,8 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="序号" align="center" prop="id" /> -->
-      <el-table-column label="序号" type="index" width="50" align="center">
-        <template scope="scope">
-          <span>{{
-            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitId" />
-      <el-table-column label="军事主官" align="center" prop="id" />
+      <!-- <el-table-column label="创建人id" align="center" prop="id" /> -->
       <el-table-column label="训练项目" align="center" prop="project" />
-      <!-- <el-table-column label="训练内容" align="center" prop="contents" /> -->
       <el-table-column
         label="训练时间"
         align="center"
@@ -113,13 +229,39 @@
       </el-table-column>
       <el-table-column label="训练地点" align="center" prop="address" />
       <el-table-column label="应训" align="center" prop="oughtTo" />
-      <el-table-column label="实训" align="center" prop="actual" />
-      <!-- <el-table-column label="参训率" align="center" prop="probability" /> -->
-      <!-- <el-table-column label="效果" align="center" prop="result" /> -->
-      <el-table-column label="消耗" align="center" prop="expend" />
-      <!-- <el-table-column label="备注" align="center" prop="remark" />
-      
-      <el-table-column label="军事主官" align="center" prop="peopleId" /> -->
+      <el-table-column label="文件名称" align="center" prop="filename" />
+      <el-table-column label="文件路径" align="center" prop="filepath" />
+      <el-table-column label="装备" align="center" prop="equipment" />
+      <el-table-column label="弹药" align="center" prop="ammunition" />
+      <el-table-column label="摩托时间" align="center" prop="mototime" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="训练结束时间"
+        align="center"
+        prop="drillEndtime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.drillEndtime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column
+        label="训练类别"
+        align="center"
+        prop="trainingCategory"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createtime"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -127,26 +269,22 @@
         width="200"
       >
         <template slot-scope="scope">
-          <el-button
-            size="btk"
-            type="text"
-            @click="handleChakan(scope.row)"
-            v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
-            ><span class="chakan">查看</span></el-button
-          >
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['grassrootsregistration:bdgldrill:edit']"
-            ><span class="edit">修改</span></el-button
+            >修改</el-button
+          >
+          <el-button size="btk" type="text" @click="handleChakan(scope.row)"
+            ><span class="chakan">查看</span></el-button
           >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['grassrootsregistration:bdgldrill:remove']"
-            ><span class="delete">删除</span></el-button
+            >删除</el-button
           >
         </template>
       </el-table-column>
@@ -164,83 +302,256 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1016px"
+      width="1060px"
       append-to-body
-      :close-on-click-modal="false"
     >
-      <div class="jiben">基本信息</div>
-
       <el-form
         ref="form"
         :model="form"
         :rules="rules"
-        label-width="80px"
         :inline="true"
+        label-width="120px"
       >
-        <el-form-item label="单位" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位" />
-        </el-form-item>
-
-        <el-form-item label="训练类别" prop="project">
-          <el-input v-model="form.project" placeholder="请输入训练类别" />
-        </el-form-item>
-        <el-form-item label="训练内容" prop="contents">
-          <el-input v-model="form.contents" placeholder="请输入训练内容" />
+        <div class="jiben">基本信息</div>
+        <el-form-item label="训练类别" prop="trainingCategory">
           <!-- <el-input
-            v-model="form.contents"
-            type="textarea"
-            placeholder="请输入内容"
+            v-model="form.trainingCategory"
+            placeholder="请输入训练类别"
           /> -->
+          <treeselect
+            v-model="form.trainingCategory"
+            :options="treeselects"
+            :normalizer="defaultProps"
+            placeholder="请选择单位"
+            @select="trainingCategoryselectPeo"
+          />
         </el-form-item>
-        <el-form-item label="训练时间" prop="drillTime">
+        <!-- <el-form-item label="训练项目" prop="project">
+          <el-input v-model="form.project" placeholder="请输入训练项目" />
+        </el-form-item> -->
+        <el-form-item
+          label="证明材料"
+          prop="project2"
+          style="display: inline-block; width: 550px"
+        >
+          <!-- <input
+            type="text"
+            v-model="form.filename"
+            style="
+              width: 280px;
+              height: 36px;
+              background: transparent;
+              color: #fff;
+              border: 1px solid #fff !important;
+              display: inline-block;
+            "
+          /> -->
+          <fileUpload
+            v-model="form.filepath"
+            style="display: inline-block"
+            :show-file-list="false"
+            class="m-l-20"
+          />
+        </el-form-item>
+        <el-form-item label="训练开始时间" prop="drillTime">
           <el-date-picker
             clearable
             size="small"
             v-model="form.drillTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择训练时间"
-            :editable="false"
+            placeholder="选择训练开始时间"
+            @change="drillTimechange"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="训练结束时间"
+          prop="drillEndtime"
+          style="margin-left: 130px"
+        >
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.drillEndtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择训练结束时间"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="训练地点" prop="address">
+        <el-form-item label="周工作内容">
+          <input
+            v-model="nr"
+            placeholder=""
+            style="
+              width: 810px;
+              height: 36px;
+              background: transparent;
+              color: #fff;
+              border: 1px solid #fff !important;
+            "
+          />
+        </el-form-item>
+        <el-row>
+          <el-checkbox
+            v-model="form.safety"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >安全训练</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.chiefOfficial"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >主官训练</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.targeted"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >针对性训练</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.system"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >系统性训练</el-checkbox
+          >
+        </el-row>
+        <el-form-item label="地点" prop="address">
+          <el-input v-model="form.address" placeholder="请输入训练地点" />
+        </el-form-item>
+        <el-form-item label="弹药" prop="ammunition">
+          <el-input v-model="form.ammunition" placeholder="请输入弹药" />
+        </el-form-item>
+        <el-form-item label="摩托时间" prop="mototime">
+          <el-input v-model="form.mototime" placeholder="请输入摩托时间" />
+        </el-form-item>
+        <el-form-item label="装备" prop="equipment">
+          <el-input v-model="form.equipment" placeholder="请输入装备" />
+        </el-form-item>
+        <!-- <el-form-item label="训练地点" prop="address">
           <el-input v-model="form.address" placeholder="请输入训练地点" />
         </el-form-item>
         <el-form-item label="应训" prop="oughtTo">
           <el-input v-model="form.oughtTo" placeholder="请输入应训" />
         </el-form-item>
-        <el-form-item label="实训" prop="actual">
-          <el-input v-model="form.actual" placeholder="请输入实训" />
+        <el-form-item label="文件名称" prop="filename">
+          <el-input v-model="form.filename" placeholder="请输入文件名称" />
+        </el-form-item> -->
+        <!-- <el-form-item label="文件路径" prop="filepath">
+          <el-input v-model="form.filepath" placeholder="请输入文件路径" />
         </el-form-item>
-        <el-form-item label="参训率" prop="probability">
-          <el-input v-model="form.probability" placeholder="请输入参训率" />
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="效果" prop="result">
-          <el-input v-model="form.result" placeholder="请输入效果" />
+
+        <el-form-item label="单位" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位" />
+        </el-form-item> -->
+
+        <!-- <el-form-item label="创建人id" prop="createId">
+          <el-input v-model="form.createId" placeholder="请输入创建人id" />
+        </el-form-item> -->
+        <el-row>
+          <el-checkbox
+            v-model="form.assessment"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >是否参加考核</el-checkbox
+          >
+        </el-row>
+        <el-form-item label="优良(人数)" prop="excellent">
+          <el-input v-model="form.excellent" placeholder="请输入优良(人数)" />
         </el-form-item>
-        <el-form-item label="消耗" prop="expend">
-          <el-input v-model="form.expend" placeholder="请输入消耗" />
+        <el-form-item label="及格(人数)" prop="pass">
+          <el-input v-model="form.pass" placeholder="请输入及格(人数)" />
         </el-form-item>
-        <el-form-item label="军事主官" prop="peopleId">
-          <el-input v-model="form.peopleId" placeholder="请输入军事主官" />
+        <el-form-item label="不及格(人数)" prop="fail">
+          <el-input v-model="form.fail" placeholder="请输入不及格(人数)" />
         </el-form-item>
-        <div class="jiben">备注</div>
-        <el-form-item label="" prop="remark">
-          <div class="box4">
-            <el-input
-              v-model="form.remark"
-              type="textarea"
-              :rows="3"
-              placeholder="请输入备注"
-              autosize
-            />
-          </div>
+        <el-row>
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="adddrillFus"
+            style="margin-left: 0px; width: 100px; margin-bottom: 20px"
+            >添加人员</el-button
+          >
+        </el-row>
+        <el-form-item label="单位" prop="unitId" style="margin-left: -60px">
+          <treeselect
+            @select="selectPeo"
+            v-model="form.unitId"
+            :options="rese"
+            placeholder="请选择单位"
+          />
         </el-form-item>
+        <el-table
+          v-loading="loading"
+          :data="drillFus"
+          :header-cell-style="{ background: '#003C69', color: 'white' }"
+        >
+          <el-table-column label="姓名" align="center" prop="peopleName">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.peopleName"
+                placeholder="请输入单位"
+                filterable
+              >
+                <el-option
+                  :label="item.name"
+                  v-for="(item, i) in renYuan"
+                  :key="i"
+                  :value="item.name"
+                  class="input_xiala"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="参训状态"
+            align="center"
+            prop="trainingStatus"
+          >
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.trainingStatus" placeholder="" />
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="state">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.state" placeholder="" />
+            </template>
+          </el-table-column>
+        </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel" size="btn">取消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <div class="fff">
@@ -262,8 +573,6 @@
 </template>
 
 <script>
-import bdgldrill from "@/components/look_word/bdgldrill.vue";
-
 import {
   listBdgldrill,
   getBdgldrill,
@@ -271,20 +580,23 @@ import {
   addBdgldrill,
   updateBdgldrill,
   exportBdgldrill,
+  treeselect,
+  getweekwork,
 } from "@/api/grassrootsregistration/bdgldrill";
+import bdgldrill from "@/components/look_word/bdgldrill.vue";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
+  getDept,
+  getZhuChiRen,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "Bdgldrill",
-  components: {
-    bdgldrill,
-  },
+  components: { Treeselect, bdgldrill },
   data() {
     return {
-      //查看页面
-      menuRoleVisible: false,
-      wordInfo: {},
-      //判断关闭
-      style: "2",
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -310,51 +622,66 @@ export default {
         pageNum: 1,
         pageSize: 10,
         project: null,
-        contents: null,
         drillTime: null,
         address: null,
         oughtTo: null,
-        actual: null,
-        probability: null,
-        result: null,
-        expend: null,
+        filename: null,
+        filepath: null,
+        equipment: null,
+        ammunition: null,
+        mototime: null,
+        drillEndtime: null,
         unitId: null,
-        peopleId: null,
+        trainingCategory: null,
+        createtime: null,
+        createId: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        safety: false,
+        chiefOfficial: false,
+        targeted: false,
+        system: false,
+        assessment: false,
+      },
       // 表单校验
-      rules: {
-        unitId: [
-          { required: true, message: "单位名称不能为空", trigger: "blur" },
-        ],
-        drillTime: [
-          { required: true, message: "训练时间不能为空", trigger: "blur" },
-        ],
-        project: [
-          { required: true, message: "训练项目不能为空", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "训练地点不能为空", trigger: "blur" },
-        ],
-        oughtTo: [{ required: true, message: "应讯不能为空", trigger: "blur" }],
-        actual: [{ required: true, message: "实讯不能为空", trigger: "blur" }],
-        probability: [
-          { required: true, message: "参训不能为空", trigger: "blur" },
-        ],
-        result: [{ required: true, message: "效果不能为空", trigger: "blur" }],
-        expend: [{ required: true, message: "消耗不能为空", trigger: "blur" }],
-        peopleId: [
-          { required: true, message: "军事主管不能为空", trigger: "blur" },
-        ],
-        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+      rules: {},
+      cities: ["安全训练"],
+      cities2: ["主官组训施教"],
+      cities3: ["针对性训练"],
+      cities4: ["使用模拟训练系统"],
+      checkedCities: [],
+      checkedCities2: [],
+      checkedCities3: [],
+      checkedCities4: [],
+      checkedCities5: [],
+      drillFus: [],
+      formdrillFus: {
+        peopleName: "",
+        state: "",
+        trainingStatus: "",
       },
-      //下拉
-      options: [],
+      open2: false,
+      rese: [],
+      renYuan: [],
+      treeselects: [],
+      defaultProps(node) {
+        return {
+          children: node.children,
+          label: node.ancestors,
+        };
+      },
+      menuRoleVisible: false,
+      nr: "",
     };
   },
   created() {
     this.getList();
+    this.getTreeselect();
+    treeselect().then((res) => {
+      console.log(res);
+      this.treeselects = res.rows;
+    });
   },
   methods: {
     /** 查询军事训练登记簿列表 */
@@ -369,6 +696,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open2 = false;
       this.reset();
     },
     // 表单重置
@@ -376,17 +704,25 @@ export default {
       this.form = {
         id: null,
         project: null,
-        contents: null,
         drillTime: null,
         address: null,
         oughtTo: null,
-        actual: null,
-        probability: null,
-        result: null,
-        expend: null,
+        filename: null,
+        filepath: null,
+        equipment: null,
+        ammunition: null,
+        mototime: null,
         remark: null,
+        drillEndtime: null,
         unitId: null,
-        peopleId: null,
+        trainingCategory: null,
+        createtime: null,
+        createId: null,
+      };
+      this.formdrillFus = {
+        peopleName: null,
+        state: null,
+        trainingStatus: null,
       };
       this.resetForm("form");
     },
@@ -400,34 +736,6 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    /** 对话框重置按钮操作 */
-    resertwo() {
-      this.reset();
-    },
-    //判断对话框添加事件
-    // close(){
-    //   if(this.style!=1){
-    //      this.$confirm('您编辑的内容尚未保存,是否退出?', '保存提示', {
-    //       confirmButtonText: '确定',
-    //       cancelButtonText: '取消',
-    //       type: 'warning'
-    //     }).then(() => {
-    //       this.open = false
-    //       // this.submitForm ()
-    //       // this.$message({
-    //       //   type: 'success',
-    //       //   message: '删除成功!'
-    //       // });
-    //     }).catch(() => {
-    //       this.open = true
-    //       // this.$message({
-    //       //   type: 'info',
-    //       //   message: '已取消删除'
-    //       // });
-    //     });
-    //   }
-    // },
-
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
@@ -436,10 +744,21 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.style = 2;
       this.reset();
       this.open = true;
       this.title = "添加军事训练登记簿";
+      this.drillFus = [];
+    },
+    //查看按钮操作
+    handleChakan(row) {
+      // 是否隐藏按钮
+      this.reset();
+      const id = row.id || this.ids;
+      getBdgldrill(id).then((response) => {
+        this.wordInfo = response.data;
+        this.title = "月 日军事训练登记表";
+        this.menuRoleVisible = true;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -447,26 +766,76 @@ export default {
       const id = row.id || this.ids;
       getBdgldrill(id).then((response) => {
         this.form = response.data;
+
+        if (this.form.safety == 1) {
+          this.form.safety = true;
+        } else {
+          this.form.safety = false;
+        }
+        if (this.form.chiefOfficial == 1) {
+          this.form.chiefOfficial = true;
+        } else {
+          this.form.chiefOfficial = false;
+        }
+        if (this.form.targeted == 1) {
+          this.form.targeted = true;
+        } else {
+          this.form.targeted = false;
+        }
+        if (this.form.system == 1) {
+          this.form.system = true;
+        } else {
+          this.form.system = false;
+        }
+        if (this.form.assessment == 1) {
+          this.form.assessment = true;
+        } else {
+          this.form.assessment = false;
+        }
+
         this.open = true;
         this.title = "修改军事训练登记簿";
       });
     },
-    //查看按钮操作
-    handleChakan(row) {
-      // 是否隐藏按钮
-      this.opens = false;
-      const id = row.id || this.ids;
-      getBdgldrill(id).then((response) => {
-        this.wordInfo = response.data;
-        this.title = "查看军事训练登记簿";
-        this.menuRoleVisible = true;
-      });
-    },
     /** 提交按钮 */
-    submitForm(style) {
-      this.style = style;
+    submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          if (this.form.filepath) {
+            if (typeof this.form.filepath != "string") {
+              let documentProofs = this.form.filepath;
+              this.form.filepath = documentProofs[0].url;
+              this.form.filename = documentProofs[0].name;
+            }
+          }
+          console.log(this.drillFus);
+          this.form.drillFus = this.drillFus;
+          if (this.form.safety) {
+            this.form.safety = 1;
+          } else {
+            this.form.safety = 0;
+          }
+          if (this.form.chiefOfficial) {
+            this.form.chiefOfficial = 1;
+          } else {
+            this.form.chiefOfficial = 0;
+          }
+          if (this.form.targeted) {
+            this.form.targeted = 1;
+          } else {
+            this.form.targeted = 0;
+          }
+          if (this.form.system) {
+            this.form.system = 1;
+          } else {
+            this.form.system = 0;
+          }
+          if (this.form.assessment) {
+            this.form.assessment = 1;
+          } else {
+            this.form.assessment = 0;
+          }
+
           if (this.form.id != null) {
             updateBdgldrill(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -487,8 +856,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        // .confirm('是否确认删除军事训练登记簿编号为"' + ids + '"的数据项?')
-        .confirm("是否确认删除该数据?")
+        .confirm('是否确认删除军事训练登记簿编号为"' + ids + '"的数据项?')
         .then(function () {
           return delBdgldrill(ids);
         })
@@ -513,21 +881,67 @@ export default {
         })
         .catch(() => {});
     },
+    adddrillFus() {
+      // this.getTreeselect();
+      this.drillFus.push({
+        peopleName: "",
+        state: "",
+        trainingStatus: "",
+      });
+    },
+    submitForm2() {
+      this.drillFus.push(this.formdrillFus);
+      console.log(this.drillFus, this.formdrillFus);
+      this.open = true;
+      this.open2 = false;
+    },
+    cancel2() {
+      this.open = true;
+      this.open2 = false;
+      this.reset();
+    },
+    handleCheckedCitiesChange() {
+      console.log(this.checkedCities);
+    },
+    /** 新增查询部门下拉树结构 */
+    getTreeselect() {
+      getDept().then((response) => {
+        this.rese = response.data;
+        console.log(this.rese);
+      });
+    },
+    // 单位选择触发
+    selectPeo(data) {
+      console.log(data);
+      getZhuChiRen(data.id).then((res) => {
+        this.renYuan = res.data;
+      });
+    },
+    trainingCategoryselectPeo(val) {
+      console.log(val);
+    },
+    drillTimechange() {
+      if (this.form.drillTime) {
+        getweekwork(this.form.drillTime).then((res) => {
+          console.log(res);
+          res.data.map((item) => {
+            this.nr += item.contents + ",";
+          });
+        });
+      }
+    },
   },
 };
 </script>
 <style scoped>
-/* 对话框背景颜色 */
 ::v-deep .el-dialog {
-  background: #004d86 !important;
-}
-::v-deep .el-textarea__inner {
-  width: 920px;
-  height: 104px;
+  /* width: 1060px !important; */
+  background-color: #004d86;
   margin: auto;
 }
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9d;
+  margin: auto;
 }
 ::v-deep .el-dialog__title {
   color: #fff;
@@ -541,140 +955,62 @@ export default {
   color: #fff;
   width: 100px !important;
 }
-::v-deep .el-input__inner {
-  /* width: 200px !important;
-  height: 36px; */
+.el-form-item ::v-deep .el-input__inner {
+  width: 350px;
+  height: 36px;
   background: transparent;
   color: #fff;
-  border: 1px solid white !important;
-  border-color: #fff !important;
+  border: 1px solid #fff !important;
 }
-/* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
   background: #004d86 !important;
+  color: #fff !important;
 }
-/* 基本信息背景 */
-.jiben {
-  width: 920px;
-  height: 32px;
-  background-image: url(../../../images/小标题底.png);
-  margin-bottom: 25px;
-  color: #fff;
-  padding-left: 16px;
-  line-height: 32px;
-}
-/*调整表单间距 */
-::v-deep .el-form-item__content {
-  width: 200px;
-}
-::v-deep .el-input__inner {
-  cursor: pointer !important;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 30px 50px;
-}
-::v-deep .el-dialog__body {
-  margin: 10px 30px 20px 50px;
-  padding-top: 20px !important;
-  box-sizing: border-box;
-  /* padding: 30px 12px 30px 28px; */
-}
-.contents {
-  padding: 0px 40px !important;
-}
-/* 下拉菜单 */
-.el-dropdown-link {
-  cursor: pointer;
-  color: #409eff;
+::v-deep .vue-treeselect__control {
+  width: 350px;
+  color: #fff !important;
 }
-.el-icon-arrow-down {
-  font-size: 12px;
+/* ::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
 }
-/* 刷新图标 */
-/* .el-icon-refresh {
-  width: 76px;
-  height: 36px;
-  color: #fff;
-  background-color: #1d96ff !important;
-  border-radius: 4px;
+::v-deep .el-select-dropdown__list {
   border: none;
-  margin-left: 20px;
-  font-size: 14px;
-} */
-/* 下拉菜单字体/背景颜色 */
-.el-select-dropdown__item.hover,
-.el-select-dropdown__item:hover {
-  background-color: #004d86;
-  color: #fff;
 }
+.el-date-table,
 .el-select-dropdown__item {
   color: #fff;
 }
-/* 时间选择 */
-::v-deep .el-input--small .el-input__inner {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
-}
-.el-date-editor.el-input {
-  width: 200px;
-  height: 36px;
-  line-height: 36px;
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #196299;
+} */
+
+::v-deep .el-upload__tip {
+  display: none;
 }
-::v-deep .el-date-editor.el-input .el-input__inner {
-  height: 36px;
-  line-height: 36px;
+/* 去掉上面的线 */
+/* ::v-deep .el-dialog .el-table th.is-leaf {
+  border: 1px solid white !important;
+} */
+
+/* 去掉最下面的那一条线 */
+/* ::v-deep .el-dialog .el-table::before {
+  border: 1px solid white !important;
+} */
+
+/* 去掉表格内的线 */
+/* ::v-deep .el-dialog table td {
+  border: 1px solid white !important;
+} */
+::v-deep .el-upload-list {
+  display: inline-block;
+  margin-left: 10px;
 }
-/* 单位框背景颜色 */
-::v-deep .vue-treeselect__control {
-  background: #004d86 !important;
-  color: #fff;
+::v-deep .upload-file-uploader {
+  display: inline-block;
 }
-/* 单位下拉菜单选中字体颜色 */
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
-/* 分页按钮 */
-::v-deep .el-pagination.is-background .el-pager li {
-  background-color: #004d86;
-  color: #fff;
-}
-::v-deep .el-pagination.is-background .btn-next {
-  background-color: #004d86;
-  color: #fff;
-}
-/* 底部确定取消按钮 */
-::v-deep .el-dialog__footer {
-  padding: 18px 42px 30px 0px;
-  margin-right: 30px;
-}
-/* 增加按钮弹框 */
-::v-deep .el-dialog {
-  width: 1060px !important;
-}
-::v-deep .el-dialog__body {
-  padding: none !important;
-}
-::v-deep .box4 .el-textarea__inner {
-  min-height: 120px !important;
-}
-
-/* 调整输入框提示文字颜色 */
-::v-deep .vue-treeselect__placeholder {
-  color: #bdbdbd4f !important;
-}
-::v-deep input::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
-::v-deep input:-moz-placeholder {
-  color: #bdbdbd4f !important;
-}
-/* 文本域提示文字颜色 */
-::v-deep ::-webkit-input-placeholder {
-  color: #bdbdbd4f !important;
-}
-#chakan /deep/ .el-dialog__body {
-  padding: 30px 0px 30px 15px;
-}
-</style>
+</style>

+ 3 - 1
src/views/system/notice/index.vue

@@ -132,7 +132,9 @@
           <span v-if="scope.row.status == '0'" style="color: #13ce66"
             >正常</span
           >
-          <span v-if="scope.row.status == '1'" style="color:#FF4949">停用</span>
+          <span v-if="scope.row.status == '1'" style="color: #ff4949"
+            >停用</span
+          >
           <!-- <dict-tag
             :options="dict.type.sys_notice_status"
             :value="scope.row.status"

+ 1 - 0
src/views/thought/talk/index.vue

@@ -720,6 +720,7 @@ export default {
     // 获取执行单位列表
     getDept2().then((res) => {
       this.users = res.data;
+      console.log(this.users);
     });
     // 获取部门列表
     getDeptList().then((res) => {