Procházet zdrojové kódy

项目审批增加了 获批的弹出框

AlvisLiu před 1 rokem
rodič
revize
48fab13ad5

+ 3 - 0
.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "vue.codeActions.enabled": false
+}

+ 18 - 6
src/views/jzggl/bbgl/apiItem.js

@@ -3,20 +3,20 @@
 import request from '@/utils/request';
 
 //列表数据
-export const queryApi = (choosePage,keyword,data={}) =>
+export const queryApi = (choosePage, keyword, data = {}) =>
   request({
     url: '/xdbg/jzggl_bbgl/index',
-    data:{issubmit:'1', api:"json",limit: 10,page: choosePage},
+    data: { issubmit: '1', api: "json", limit: 10, page: choosePage },
   });
 // 添加接口  
 export const addApi = (data = {}) => request({
   url: '/xdbg/jzggl_bbgl/add',
-  data: { issubmit:'1', issubmit: 1,xdbg_jzggl_bbgl:data}
+  data: { issubmit: '1', issubmit: 1, xdbg_jzggl_bbgl: data }
 });
 //编辑接口
-export const editApi = (chooseId,data={}) => request({
+export const editApi = (chooseId, data = {}) => request({
   url: '/xdbg/jzggl_bbgl/edit',
-  data: {issubmit: 1,xjj_id:chooseId,xdbg_jzggl_bbgl:data}
+  data: { issubmit: 1, xjj_id: chooseId, xdbg_jzggl_bbgl: data }
 });
 //详情接口
 export const detailApi = (chooseId) => request({
@@ -26,5 +26,17 @@ export const detailApi = (chooseId) => request({
 //删除接口
 export const deleteApi = (chooseId) => request({
   url: '/xdbg/jzggl_bbgl/delete',
-  data: {issubmit:'1', xgg_id:chooseId}
+  data: { issubmit: '1', xgg_id: chooseId }
 });
+//用户列表
+export const org_users = (data = {}) =>
+  request({
+    url: '/user/main/index',
+    data: {
+      dept_id: data.dept_id,
+      all: '1',
+      page: data.page,
+      limit: data.limit
+
+    }
+  })

+ 148 - 105
src/views/jzggl/bbgl/index.vue

@@ -4,41 +4,61 @@
 
     <div class="common common_content">
       <div class="optionBtnFuc">
-        <el-button type="primary" @click="createNew">新建</el-button>
+        <el-button type="primary"
+          @click="createNew">新建</el-button>
       </div>
-      <div class="filingList clearFix" >
-        <div class="singleFiling fl" v-for="(item,index) in tableData" :key="index" @click="toTargetList(item)">
+      <div class="filingList clearFix">
+        <div class="singleFiling fl"
+          v-for="(item, index) in tableData"
+          :key="index"
+          @click="toTargetList(item)">
           <div class="tempImg">
-             <img src="../../../assets/fileIcon.png" alt="">
+            <img src="../../../assets/fileIcon.png"
+              alt="">
           </div>
-          <p>{{item.xjb_bbt}}</p>
+          <p>{{ item.xjb_bbt }}</p>
         </div>
 
       </div>
     </div>
     <!-- 新建归档 -->
-    <el-dialog title="新建归档" :visible.sync="dialogCreateVisible">
-      <el-form :model="creatForm" :rules="GDRules" ref="GDcreatForm">
-        <el-form-item label="归档名称" prop="title" :label-width="formLabelWidth">
-          <el-input v-model="creatForm.title" autocomplete="off" placeholder="请输入归档名称"></el-input>
+    <el-dialog title="新建归档"
+      :visible.sync="dialogCreateVisible">
+      <el-form :model="creatForm"
+        :rules="GDRules"
+        ref="GDcreatForm">
+        <el-form-item label="归档名称"
+          prop="title"
+          :label-width="formLabelWidth">
+          <el-input v-model="creatForm.title"
+            autocomplete="off"
+            placeholder="请输入归档名称"></el-input>
         </el-form-item>
-        <el-form-item label="类型" prop="regionType" :label-width="formLabelWidth">
-          <el-select v-model="creatForm.regionType" placeholder="请选择类型">
-            <el-option label="普通" value="2"></el-option>
-            <el-option label="加急" value="1"></el-option>
+        <el-form-item label="类型"
+          prop="regionType"
+          :label-width="formLabelWidth">
+          <el-select v-model="creatForm.regionType"
+            placeholder="请选择类型">
+            <el-option label="普通"
+              value="2"></el-option>
+            <el-option label="加急"
+              value="1"></el-option>
           </el-select>
         </el-form-item>
-         <el-form-item label="创建人" prop="regionCreater" :label-width="formLabelWidth">
-          <el-select v-model="creatForm.regionCreater" placeholder="请选择创建人">
-            <el-option label="李天然" value="李天然"></el-option>
-            <el-option label="李风起" value="李风起"></el-option>
+        <el-form-item label="创建人"
+          prop="regionCreater"
+          :label-width="formLabelWidth">
+          <el-select v-model="creatForm.regionCreater"  placeholder="请选择创建人" filterable="">
+            <el-option  v-for="(item,index) in userList" :key="index" :label="item.label"  :value="item.value"></el-option>
           </el-select>
         </el-form-item>
 
       </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+        class="dialog-footer">
         <el-button @click="dialogCreateVisible = false">取 消</el-button>
-        <el-button type="primary" @click="onSubmit('GDcreatForm')">确 定</el-button>
+        <el-button type="primary"
+          @click="onSubmit('GDcreatForm')">确 定</el-button>
       </div>
     </el-dialog>
 
@@ -46,110 +66,133 @@
 </template>
 
 <script>
-import { queryApi ,addApi,editApi,detailApi,deleteApi } from './apiItem';
-import { useUserStore } from '@/stores/user';
-  export default {
-    data() {
-      return {
-        tableData:[],
-        dialogCreateVisible: false,
-        creatForm: {
-          title: '',
-          regionType: '',
-          regionCreater:'',
-        },
-        GDRules: {
-          title: [
-            { required: true, message: '请输入标题', trigger: 'blur' },
-          ],
-          regionType: [
-            { required: true, message: '请选择类型', trigger: 'change' }
-          ],
-          regionCreater: [
-            { required: true, message: '请选择创建人', trigger: 'change' }
-          ]
-        },
-        formLabelWidth: '80px',
-        dialog:{
-          title:'添加归档',
-          option:'create'
-        },
-      }
-    },
-    mounted() {
-      this.initList(1);
-    },
-    methods: {
-      initList(choosePage,keyword){
-        queryApi(choosePage,keyword).then(res => {
-          this.tableData = res.data.page_data;
-          this.paganationsTotal=Number(res.data.total_rows);
-        })
+import { queryApi, addApi, editApi, detailApi, deleteApi, org_users } from './apiItem';
+import { useUserStore } from "@/stores/user";
+const { real_name, user_id, dept_ids, uo_id, uo_name, } = useUserStore();
+export default {
+  data() {
+    return {
+      tableData: [],
+      dialogCreateVisible: false,
+      creatForm: {
+        title: '',
+        regionType: '',
+        regionCreater: '',
       },
-      /**跳转对应路由*/
-      toTargetList(markLable){
-        var markText=markLable.xjb_bbt;
-        switch(markText){
-          case '事业单位报表'://事业单位报表
+      GDRules: {
+        title: [
+          { required: true, message: '请输入标题', trigger: 'blur' },
+        ],
+        regionType: [
+          { required: true, message: '请选择类型', trigger: 'change' }
+        ],
+        regionCreater: [
+          { required: true, message: '请选择创建人', trigger: 'change' }
+        ]
+      },
+      formLabelWidth: '80px',
+      dialog: {
+        title: '添加归档',
+        option: 'create'
+      },
+      userList: '',
+      paganationsTotal: '',
+      
+    }
+  },
+  mounted() {
+    this.getUserList();
+    this.initList(1);
+  },
+  methods: {
+    initList(choosePage, keyword) {
+      queryApi(choosePage, keyword).then(res => {
+        this.tableData = res.data.page_data;
+        this.paganationsTotal = Number(res.data.total_rows);
+      })
+    },
+    /**跳转对应路由*/
+    toTargetList(markLable) {
+      var markText = markLable.xjb_bbt;
+      switch (markText) {
+        case '事业单位报表'://事业单位报表
           this.$router.push("sydwbb");
           break;
-          case '干部报表'://干部报表
+        case '干部报表'://干部报表
           this.$router.push("gbbb");
           break;
-          case '党员报表'://党员报表
+        case '党员报表'://党员报表
           this.$router.push("dybb");
           break;
-        }
-      },
-      /**打开dialog*/
-      createNew(){
-        this.dialogCreateVisible=true;
-      },
-      /**提交*/
-       onSubmit(formName){
-        const judgeOption=this.dialog.option;
-        this.$refs[formName].validate((valid)=>{
-          if (valid) {
-            var transParams={
-              xjb_bbt:this.creatForm.title,
-              xjb_lx:this.creatForm.regionType,
-              xjb_cjr:this.creatForm.regionCreater
-            }
-            if(judgeOption=="create"){//添加按钮
-              addApi(transParams)
-              .then((res)=>{
-                if(res.code=='1'){
-                  this.dialogCreateVisible=false;
+      }
+    },
+    /**打开dialog*/
+    createNew() {
+      this.dialogCreateVisible = true;
+    },
+    /**提交*/
+    onSubmit(formName) {
+      const judgeOption = this.dialog.option;
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          var transParams = {
+            xjb_bbt: this.creatForm.title,
+            xjb_lx: this.creatForm.regionType,
+            xjb_cjr: this.creatForm.regionCreater
+          }
+          if (judgeOption == "create") {//添加按钮
+            addApi(transParams)
+              .then((res) => {
+                if (res.code == '1') {
+                  this.dialogCreateVisible = false;
                   this.$message({
-                    message:"数据添加成功",
-                    type:'success'
+                    message: "数据添加成功",
+                    type: 'success'
                   });
                   this.initList();
                 }
               });
-            }else{//编辑按钮
-              var chooseId=Number(this.creatForm.id);
-              editApi(chooseId,transParams)
-              .then((res)=>{
-                if(res.code=="1"){
-                  this.dialogCreateVisible=false;
+          } else {//编辑按钮
+            var chooseId = Number(this.creatForm.id);
+            editApi(chooseId, transParams)
+              .then((res) => {
+                if (res.code == "1") {
+                  this.dialogCreateVisible = false;
                   this.initList();
                 }
               })
-              .catch((error)=>{
+              .catch((error) => {
                 console.log(error);
               })
-            }
-          }else{
-            return false;
           }
-        });
-      },
-      
+        } else {
+          return false;
+        }
+      });
+    },
+    //获取用户数据
+    getUserList() {
+      let data = {
+        dept_id: dept_ids[0],
+        page: 1,
+        limit: 99999
+      }
+      org_users(data).then(res => {
+        if (res.code == 1) {
+          let tempArray = [];
+          res.data.page_data.forEach(item => {
+            tempArray.push({
+              label: item.user_realname,
+              value:item.user_id
+            })
+          });
+          this.userList = tempArray;
+        }
+      })
     },
-  }
-</script>
 
-<style scoped>
+  },
+}
+</script>
 
-</style>
+<style scoped></style>

+ 7 - 7
src/views/jzggl/jsgl/index.vue

@@ -42,27 +42,27 @@
         <el-table ref="multipleSelection" :data="tableData" tooltip-effect="dark" style="width: 100%"
           @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"> </el-table-column>
-          <el-table-column label="职称">
+          <el-table-column label="职称" show-overflow-tooltip>
             <template slot-scope="scope">
               <div>{{ scope.row.xjj_zc }}</div>
             </template>
           </el-table-column>
-          <el-table-column prop="xjj_xm" label="姓名"></el-table-column>
+          <el-table-column prop="xjj_xm" label="姓名" show-overflow-tooltip></el-table-column>
           <el-table-column prop="xjj_zgbh" label="职工编号" show-overflow-tooltip></el-table-column>
           <el-table-column prop="xjj_sfzjh" label="身份证件号" show-overflow-tooltip></el-table-column>
-          <el-table-column label="年龄">
+          <el-table-column label="年龄" show-overflow-tooltip>
             <template slot-scope="scope">
               <div> {{ scope.row.xjj_nl }}岁</div>
             </template>
           </el-table-column>
-          <el-table-column prop="xjj_bm" label="部门/研发组"></el-table-column>
-          <el-table-column prop="xjj_jsxl" label="教师学历"></el-table-column>
-          <el-table-column label="教师教龄">
+          <el-table-column prop="xjj_bm" label="部门/研发组" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="xjj_jsxl" label="教师学历" show-overflow-tooltip></el-table-column>
+          <el-table-column label="教师教龄" show-overflow-tooltip>
             <template slot-scope="scope">
               <div> {{ scope.row.xjj_jsjl }}年</div>
             </template>
           </el-table-column>
-          <el-table-column label="农村工作年限">
+          <el-table-column label="农村工作年限" show-overflow-tooltip>
             <template slot-scope="scope">
               <div> {{ scope.row.xjj_ncgznx }}年</div>
             </template>

+ 7 - 7
src/views/jzggl/jswh/index.vue

@@ -42,27 +42,27 @@
       <div class="mainContent">
         <el-table  ref="multipleSelection"  :data="tableData"  tooltip-effect="dark"  style="width: 100%"  @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center"> </el-table-column>
-          <el-table-column label="职称">
+          <el-table-column label="职称" show-overflow-tooltip>
             <template slot-scope="scope">
               <div>{{ scope.row.xjj_zc}}</div>
             </template>
           </el-table-column>
-          <el-table-column prop="xjj_xm" label="姓名"></el-table-column>
+          <el-table-column prop="xjj_xm" label="姓名" show-overflow-tooltip></el-table-column>
           <el-table-column prop="xjj_zgbh" label="职工编号" show-overflow-tooltip></el-table-column>
           <el-table-column prop="xjj_sfzjh" label="身份证件号" show-overflow-tooltip></el-table-column>
-          <el-table-column label="年龄">
+          <el-table-column label="年龄" show-overflow-tooltip>
              <template slot-scope="scope">
               <div> {{ scope.row.xjj_nl }}岁</div>
             </template>
           </el-table-column>
-          <el-table-column prop="xjj_bm" label="部门/研发组" ></el-table-column>
-          <el-table-column prop="xjj_jsxl" label="教师学历" ></el-table-column>
-           <el-table-column label="教师教龄"  >
+          <el-table-column prop="xjj_bm" label="部门/研发组" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="xjj_jsxl" label="教师学历" show-overflow-tooltip></el-table-column>
+           <el-table-column label="教师教龄" show-overflow-tooltip >
             <template slot-scope="scope">
               <div> {{ scope.row.xjj_jsjl }}年</div>
             </template>
           </el-table-column>
-          <el-table-column label="农村工作年限"  >
+          <el-table-column label="农村工作年限" show-overflow-tooltip>
             <template slot-scope="scope">
               <div> {{ scope.row.xjj_ncgznx }}年</div>
             </template>

+ 73 - 17
src/views/xmlxsb/xmsq/index.vue

@@ -277,6 +277,25 @@
       </div>
     </el-dialog>
 
+    <!-- dialog 获批 -->
+    <el-dialog title="获批" :visible.sync="dialogFormVisible_hp">
+    <el-form :model="formHP" :rules="rulesHP" ref="formHP" >
+      <el-form-item label="日期:" :label-width="formLabelWidth" prop="dateChoose">
+        <el-date-picker  v-model="formHP.dateChoose"  type="date"  placeholder="选择日期"  style="width: 100%;"  format="yyyy-MM-dd"  value-format="yyyy-MM-dd"  >
+    </el-date-picker>
+      </el-form-item>
+      <el-form-item label="会议名称:" :label-width="formLabelWidth" prop="name">
+        <el-input v-model="formHP.name" autocomplete="off" placeholder="请输入会议名称"></el-input>
+      </el-form-item>
+      <el-form-item label="内容:" :label-width="formLabelWidth" prop="meetingCont">
+        <el-input type="textarea" v-model="formHP.meetingCont" :rows="7" placeholder="请输入内容"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogFormVisible_hp = false">取 消</el-button>
+      <el-button type="primary" @click="getApplyDataBtn('formHP')">确 定</el-button>
+    </div>
+  </el-dialog>
 
   </div>
 </template>
@@ -413,6 +432,28 @@ export default {
       isMaster: false,
 
       fixDepartments: [],
+
+      dialogFormVisible_hp: false,
+      formHP: {
+        dateChoose: "",
+        name: "",
+        meetingCont: ""
+      },
+      formLabelWidth: '120px',
+      rulesHP: {
+        dateChoose: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        name: [
+          { required: true, message: '请输入会议室名称', trigger: 'blur' },
+          // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        meetingCont: [
+          { required: true, message: '请填写内容', trigger: 'blur' }
+        ]
+      },
+      curXMID: '',
+      
     };
   },
   mounted() {
@@ -903,22 +944,32 @@ export default {
       this.$router.push({ name: "xmlxsb_xmsq_dybb", params: { id: chooseID } });
       //
     },
-    //获批
+    //获批打开dialog
     getApplyData(item) {
-      //编辑接口中的获批阶段
-      let transObj = {
-        issubmit: 1,
-        xm_id: item.xm_id,
-        jdbg_xmlxsb_xmsq: {
-          xm_is_wc: 1//是否获批 1是 2否 3待审
-        }
-      }
-      this.$confirm("确认获批该项目?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
+      this.dialogFormVisible_hp = true;
+      this.curXMID = item.xm_id;
+      this.formHP = {
+        dateChoose: '',
+        name: '',
+        meetingCont: ''
+      };
+    },
+  
+    //获批
+    getApplyDataBtn(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          //编辑接口中的获批阶段
+          let transObj = {
+            issubmit: 1,
+            xm_id: this.curXMID,
+            jdbg_xmlxsb_xmsq: {
+              xm_hpsj:this.formHP.dateChoose,//获批时间
+              xm_hysmc:this.formHP.name,//会议室名称
+              xm_hpnr:this.formHP.meetingCont,//获批内容
+              xm_is_wc: 1//是否获批 1是 2否 3待审
+            }
+          }
           xmsq_edit(transObj).then((res) => {
             if (res.code == 1) {
               this.$message({
@@ -926,6 +977,7 @@ export default {
                 type: "success",
               });
               this.initChecked();
+              this.dialogFormVisible_hp = false;
             } else {
               this.$message({
                 message: res.msg,
@@ -933,8 +985,12 @@ export default {
               });
             }
           });
-        })
-        .catch((err) => { console.log(err) });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+      
     },
     //待审
     waitCheck(item) {

+ 12 - 4
src/views/xmlxsb/xmsq/xq/index.vue

@@ -76,14 +76,22 @@
                 </div>
               </td>
             </tr>
+            <tr v-show="tableFormData.xm_hpsj">
+              <td class="titleOpt" style="width:150px;">日期:</td>
+              <td>{{ tableFormData.xm_hpsj }}</td>
+            </tr>
+            <tr v-show="tableFormData.xm_hysmc">
+              <td class="titleOpt" style="width:150px;">会议名称:</td>
+              <td>{{ tableFormData.xm_hysmc }}</td>
+            </tr>
+            <tr v-show="tableFormData.xm_hpnr">
+              <td class="titleOpt" style="width:150px;">内容:</td>
+              <td>{{ tableFormData.xm_hpnr }}</td>
+            </tr>
           </tbody>
 
         </table>
 
-        <!-- <div class="d-flex flex-between mt-4  whitespace-nowrap baseInfoPrintBottom">
-          <div>打印人:{{ real_name }}</div>
-          <div>打印时间:{{ currrentTime }}</div>
-        </div> -->
         <div class="flex justify-between mt-1 whitespace-nowrap text-base">
           <div class="flex-none">打印人:{{ real_name }}</div>
           <div class="flex-none">打印时间:{{ currrentTime }}</div>