zc

src/api/commonality/permission.js

@@ -6,7 +6,7 @@ import request from '@/utils/request'
 */
 export function systemUserSelectUser(data) {
   return request({
-    url: '/system/user/selectUser',
+    url: '/system/user/dropList',
     method: 'post',
     data: data
   })

src/api/integratedManagement/index.js

@@ -476,3 +476,56 @@ export function systemPostDelete(data) {
     data: data
   })
 }
+/***************** 课题组 *****************/
+
+//课题组-列表
+export function systemTopicList(data) {
+  return request({
+    url: '/system/topic/list',
+    method: 'post',
+    data: data
+  })
+}
+
+//课题组-新增
+export function systemTopicAdd(data) {
+  return request({
+    url: '/system/topic/add',
+    method: 'post',
+    data: data
+  })
+}
+
+//课题组-编辑
+export function systemTopicEdit(data) {
+  return request({
+    url: '/system/topic/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+//课题组-详情
+export function systemTopicDetail(query) {
+  return request({
+    url: '/system/topic/detail',
+    method: 'get',
+    params: query
+  })
+}
+//课题组-删除
+export function systemTopicTopicDel(data) {
+  return request({
+    url: '/system/topic/topicDel',
+    method: 'post',
+    data: data
+  })
+}
+//课题组-启用/停用
+export function systemTopicEditTopicStart(data) {
+  return request({
+    url: '/system/topic/editTopicStart',
+    method: 'post',
+    data: data
+  })
+}

src/views/chemicalManage/basicManagement/basicConfig/index.vue

@@ -3,7 +3,9 @@
   <div class="app-container basicConfig">
     <div class="page-top-title-box">
       <p class="page-top-title-name-p" style="margin-left:20px;">基础配置</p>
-      <p class="page-top-title-add-p" @click="submitButton">提交</p>
+      <p class="page-top-title-add-p"
+         v-hasPermiRouter="['chemical:basicConfig:add']"
+         @click="submitButton">提交</p>
     </div>
     <div class="page-max-big-box scrollbar-box" v-if="showType">
       <el-form :model="configForm" ref="configForm"
@@ -136,9 +138,14 @@
                 ></el-switch>
               </el-form-item>
               <el-form-item label="" prop="outRange" style="margin:2px 0 0 20px;">
-                <el-checkbox-group v-model="item.outRange">
-                  <el-checkbox :label="true">仅量程外</el-checkbox>
-                </el-checkbox-group>
+                <div class="check-img-bog" @click="checkImgButton(item)">
+                  <img v-if="item.outRange" src="@/assets/ZDimages/basicsModules/icon_xzqx_xz.png">
+                  <img v-if="!item.outRange" src="@/assets/ZDimages/basicsModules/icon_xzqx_zc.png">
+                  <p>仅量程外</p>
+                </div>
+                <!--<el-checkbox-group v-model="item.outRange">-->
+                  <!--<el-checkbox :label="true">仅量程外</el-checkbox>-->
+                <!--</el-checkbox-group>-->
               </el-form-item>
             </div>
             <div style="margin-top:5px;" v-if="item.controlType == checkType">
@@ -211,6 +218,10 @@
           this.$set(this,'checkType',type);
         }
       },
+      //仅量程外开关
+      checkImgButton(item){
+        item.outRange = !item.outRange;
+      },
       //提交
       submitButton(){
         this.$refs["configForm"].validate(valid => {
@@ -344,6 +355,21 @@
             text-align: center;
           }
         }
+        .check-img-bog{
+          display: flex;
+          cursor: pointer;
+          margin-left:10px;
+          img{
+            width:16px;
+            height:16px;
+            margin:12px 10px 0 0;
+            border-radius:50%;
+            overflow: hidden;
+          }
+          p{
+            line-height: 40px;
+          }
+        }
       }
     }
     .button-bottom-box{

src/views/integratedManagement/personnelManage/researchGroupManage/addPage.vue

@@ -7,26 +7,26 @@
     <div class="content-box scrollbar-box">
       <el-form class="add-form-box" :model="addForm" ref="form" :rules="rules" label-width="160px">
         <div style="display: flex">
-          <el-form-item label="课题名称：" prop="data1">
-            <el-input v-model="addForm.data1" placeholder="请输入课题名称" maxLength="20" style="width:1260px;"></el-input>
+          <el-form-item label="课题名称：" prop="topicName">
+            <el-input v-model="addForm.topicName" placeholder="请输入课题名称" maxLength="20" style="width:1260px;"></el-input>
           </el-form-item>
-          <el-form-item label="" prop="data2" class="page-switch" label-width="40px">
+          <el-form-item label="" prop="isStart" class="page-switch" label-width="40px">
             <el-switch
               :active-value="true"
               :inactive-value="false"
               active-color="#0183FA"
               inactive-color="#999"
-              v-model="addForm.data2"
+              v-model="addForm.isStart"
               active-text="启用"
               inactive-text="停用"
             ></el-switch>
           </el-form-item>
         </div>
         <div style="display: flex">
-          <el-form-item label="课题负责人：" prop="data3">
+          <el-form-item label="课题负责人：" prop="userId">
             <el-select
               style="width:600px;"
-              v-model="addForm.data3"
+              v-model="addForm.userId"
               filterable
               remote
               reserve-keyword
@@ -40,11 +40,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="手机号码：" label-width="170px" prop="data4">
+          <el-form-item label="手机号码：" label-width="170px" prop="userPhone">
             <el-input
               style="width:600px;"
               maxlength="11"
-              v-model="addForm.data4"
+              v-model="addForm.userPhone"
               placeholder="未填写"
               onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"
             />
@@ -112,6 +112,8 @@
   //import { getDicts } from "@/api/commonality/noPermission";
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
+
+  import { systemTopicDetail } from "@/api/integratedManagement/index";
   import { systemUserSelectUser } from "@/api/commonality/permission";
   import userDialog from "./userDialog.vue";
   export default {
@@ -128,15 +130,15 @@
         optionsUser:[],
         addForm:{},
         rules:{
-          data1: [
+          topicName: [
             { required: true, message: "请输入课题名称", trigger: "blur" },
             { required: true, message: "请输入课题名称", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          data3: [
+          userId: [
             { required: true, message: "搜索选择课题负责人", trigger: "blur" },
             { required: true, message: "搜索选择课题负责人", validator: this.spaceJudgment, trigger: "blur" }
           ],
-          data4: [
+          userPhone: [
             { required: true, message: "请输入手机号码", trigger: "blur" },
             { validator: this.checkPhone, trigger: 'blur' },
             { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
@@ -154,16 +156,30 @@
       }
     },
     created(){
-
+      this.dataInitialization();
     },
     mounted(){
 
     },
     methods:{
+      dataInitialization(){
+        if(this.propsData.id){
+          this.systemTopicDetail();
+        }
+      },
       // 返回按钮
       backPage(){
         this.$parent.tableButton(6);
       },
+      //查询详情
+      systemTopicDetail(){
+        systemTopicDetail({id:this.propsData.id}).then(response => {
+          let obj = response.data.topic;
+          obj.memberList = response.data.memberList;
+          this.userSelectList(obj.userName);
+          this.$set(this,'addForm',obj);
+        });
+      },
       getList(){
 
       },

src/views/integratedManagement/personnelManage/researchGroupManage/index.vue

@@ -5,8 +5,8 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" placeholder="请选择状态" style="width: 200px">
+          <el-form-item label="" prop="isStart">
+            <el-select v-model="queryParams.isStart" placeholder="请选择状态" style="width: 200px">
               <el-option
                 v-for="dict in optionList"
                 :key="dict.value"
@@ -15,20 +15,20 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData3">
-            <el-select v-model="queryParams.queryParamsData3" placeholder="请选择部门" style="width: 200px">
+          <el-form-item label="" prop="deptId">
+            <el-select v-model="queryParams.deptId" placeholder="请选择二级单位" style="width: 200px">
               <el-option
                 v-for="dict in sectionOptionList"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData1">
+          <el-form-item label="" prop="searchValue">
             <el-input
               maxLength="30"
-              v-model="queryParams.queryParamsData1"
+              v-model="queryParams.searchValue"
               placeholder="课题名称/负责人/成员"
               style="width: 200px"
             />
@@ -47,12 +47,12 @@
       </div>
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
-          <el-table-column label="课题组" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="负责人" prop="content" width="180" show-overflow-tooltip/>
-          <el-table-column label="联系电话" prop="content" width="150" show-overflow-tooltip/>
-          <el-table-column label="所属部门" prop="content" width="150" show-overflow-tooltip/>
-          <el-table-column label="成员数" prop="content" width="100" show-overflow-tooltip/>
-          <el-table-column label="状态" prop="state" width="135" show-overflow-tooltip>
+          <el-table-column label="课题组" prop="topicName"  show-overflow-tooltip/>
+          <el-table-column label="负责人" prop="userName" width="180" show-overflow-tooltip/>
+          <el-table-column label="联系电话" prop="userPhone" width="150" show-overflow-tooltip/>
+          <el-table-column label="所属部门" prop="deptName" width="150" show-overflow-tooltip/>
+          <el-table-column label="成员数" prop="num" width="100" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="isStart" width="135" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-switch
                 @click.native="tableButton(5,scope.row)"
@@ -61,7 +61,7 @@
                 :inactive-value="false"
                 active-color="#0183FA"
                 inactive-color="#999"
-                v-model="scope.row.state"
+                v-model="scope.row.isStart"
                 active-text="启用"
                 inactive-text="停用"
                 disabled
@@ -70,10 +70,10 @@
           </el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="180" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="创建人" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="创建人" prop="createByName" width="150" show-overflow-tooltip/>
           <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
             <template slot-scope="scope">
               <div class="table-button-box">
@@ -109,9 +109,8 @@
   </div>
 </template>
 <script>
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { systemTopicList,systemTopicAdd,systemTopicEdit,systemTopicTopicDel,systemTopicEditTopicStart } from "@/api/integratedManagement/index";
+  import { getDeptDropList } from "@/api/commonality/permission";
   import importComponent from "@/components/importComponent/importComponent.vue";
   import addPage from "./addPage.vue";
   import listPage from "./listPage.vue";
@@ -144,12 +143,12 @@
         queryParams:{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
-          queryParamsData2 :null,
-          queryParamsData3 :null,
+          searchValue:"",
+          isStart :null,
+          deptId :null,
         },
         //列表数据
-        dataList:[{}],
+        dataList:[],
         //数据数量
         total:0,
         //组件传参
@@ -160,7 +159,8 @@
 
     },
     mounted () {
-      //this.getList();
+      this.getDeptDropList();
+      this.getList();
     },
     methods: {
       //查询按钮
@@ -173,19 +173,20 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
-          queryParamsData2 :null,
+          searchValue:"",
+          isStart :null,
+          deptId :null,
         });
         this.getList();
       },
       //获取数据列表
       getList(){
-        // this.$set(this,'loading',true);
-        // getListFunction(this.queryParams).then(response => {
-        //   this.$set(this,'loading',false);
-        //   this.$set(this,'dataList',response.data.records);
-        //   this.$set(this,'total',response.data.total);
-        // });
+        this.$set(this,'loading',true);
+        systemTopicList(this.queryParams).then(response => {
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+          this.$set(this,'loading',false);
+        });
       },
       //操作按钮
       tableButton(type,row){
@@ -202,10 +203,9 @@
           this.$set(this,'propsData',obj);
         }else if(type == 3){
           //编辑
-          this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = false;
           this.$set(this,'propsData',obj);
+          this.$set(this,'pageType',2);
         }else if(type == 4){
           //删除
           this.$confirm('是否确认删除?', "警告", {
@@ -214,7 +214,7 @@
             type: "warning"
           }).then(function() {
           }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
+            systemTopicTopicDel({id:row.id}).then(response => {
               self.msgSuccess(response.message)
               self.getList();
             });
@@ -228,7 +228,7 @@
             type: "warning"
           }).then(function() {
           }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
+            systemTopicEditTopicStart({id:row.id,isStart:!row.isStart,}).then(response => {
               self.msgSuccess(response.message)
               self.getList();
             });
@@ -239,6 +239,12 @@
           this.getList();
         }
       },
+      //获取二级单位列表
+      getDeptDropList(){
+        getDeptDropList({level:2 }).then(response => {
+          this.$set(this,'sectionOptionList',response.data);
+        });
+      },
     },
   }
 </script>