Merge remote-tracking branch 'origin/master'

supervise-enterprise-ui/src/router/modules/codemenu.js

@@ -456,6 +456,13 @@ const codemenu = [{
       import('@/views/paichanguanliFlow/paichanguanli/haveDone.vue'),
     name: 'haveDone'
   },
+  // 代办的编辑
+  {
+    path: '/LookYzsq/index',
+    component: () =>
+      import('@/views/Yjsq/LookYzsq/index.vue'),
+      name: 'LookYzsq'
+  },
 
 ]
 export default codemenu

supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue

@@ -23,7 +23,9 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item class="trightb_item">
-                  <el-form-item>{{ projectName }}</el-form-item>
+                  <el-select v-model="formobj.orgDeptName"  placeholder="请选择" @change="changeOrgDept" clearable >
+                  <el-option v-for="(item,i) in projectSidList" :key="i" :label="item.entryName" :value="item.entryName"></el-option>
+                </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="4" class="trightb">
@@ -204,17 +206,17 @@
           },
           industryAllList: [],
           industryList: [],
-          projectName:'heps',
-          projectSid:'51be22ac-4944-4ccb-a4d3-fce5740b814f',
           userSid:'',
           imgList: [],
           msg:[],
           checkList:[],
+          projectSidList:[]
           
         }
       },
       created() {
-        this.userSid = window.sessionStorage.getItem('userSid')
+        this.formobj.user_sid = window.sessionStorage.getItem('userSid')
+        this.projectSidList= JSON.parse(window.sessionStorage.getItem("projectSidList"));
       },
       watch: {
        imgList:{
@@ -231,9 +233,6 @@
     },
       methods: {
         saveOrUpdate() {
-          this.formobj.project_name=this.projectName
-          this.formobj.project_sid=this.projectSid
-          this.userSid = window.sessionStorage.getItem('userSid')
           this.backcheckList()
           if (this.formobj.sid) {
             req.sealrecordSave(this.formobj)
@@ -271,9 +270,6 @@
           
         },
         saveSubmit(){
-          this.formobj.project_name=this.projectName
-          this.formobj.project_sid=this.projectSid
-          this.userSid = window.sessionStorage.getItem('userSid')
           this.backcheckList()
             req.sealrecordSubmit(this.formobj)
               .then(resp => {
@@ -304,7 +300,7 @@
            this.title= "【修改】印鉴信息"
            req.fetchDetailsBySid(row).then((res)=>{
             if(res.code==200){
-                // this.formobj.project_sid=res.data.project_sid
+                this.formobj.project_sid=res.data.project_sid
                 this.formobj.sid=res.data.sid
                 this.formobj.project_name=res.data.project_name
                 this.formobj.code=res.data.code
@@ -344,6 +340,19 @@
           var List=str.replace(/^,+/, '');
           this.formobj.seal_type = List
         },
+        changeOrgDept(value) {
+          let bb = {}
+          this.projectSidList.forEach((e) => {
+            if (e.entryName === value) {
+              bb = {
+                entryName: e.entryName,
+                sid: e.sid
+              }
+            }
+          })
+          this.formobj.project_sid = bb.sid
+          this.formobj.project_name = bb.entryName
+        },
         getHangYe(value) {
            const choose = this.industryList.filter((item) => item.dictKey === value)
            this.formobj.industryName = choose[0].dictValue

supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue

@@ -0,0 +1,386 @@
+<template>
+    <div class="app-container">
+      <div>
+        <div class="tab-header webtop">
+          <div>{{title}}</div>
+          <div>
+            <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+            <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveSubmit">提交</el-button>
+          </div>
+        </div>
+        <div class="listconadd" style="padding-bottom: 50px;">
+          <el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
+            <div class="titwu">印鉴信息表</div>
+            <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+              <div>主体信息</div>
+            </div>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">项目名称</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <el-form-item>{{ projectName }}</el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">申请日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" class="trightb_item">
+                <el-form-item class="trightb_item">
+                    <el-date-picker v-model="formobj.applicant_date" type="date" style="width:100%" value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">审批编号</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <el-input v-model="formobj.code" placeholder="请输入审批编号" style="width:100%" class="addinputw"
+                    clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">申请人</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                    <el-input v-model="formobj.applicant_name" placeholder="请输入申请人姓名" style="width:100%" class="addinputw"
+                    clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">用印人</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                    <el-input v-model="formobj.user_name" placeholder="请输入用印人姓名" style="width:100%" class="addinputw"
+                    clearable />
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">用印事由</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                    <el-input v-model="formobj.use_reason" placeholder="请输入用印事由" style="width:100%" class="addinputw"
+                    clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+  
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">使用日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" class="trightb_item">
+                <el-form-item class="trightb_item">
+                    <el-date-picker v-model="formobj.use_date" type="date" style="width:100%" value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">用印文件名称</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <el-input v-model="formobj.use_file_name" placeholder="请输入用印文件名称" style="width:100%"
+                    class="addinputw" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+              <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">用印文件(附件)</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item class="trightb_item">
+                  <upload
+                    class="item_input"
+                    ref="uploadImg"
+                    :minet-list="msg"
+                    v-model="imgList"
+                    @change="backDatas"
+                    bucket="map"
+                    :upload-data="{ type: '0001' }"
+                  ></upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+  
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">加盖何种公章</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item class="trightb_item">
+                    <el-checkbox-group v-model="checkList" @change="backcheckList">
+                    <el-checkbox label="公章"></el-checkbox>
+                    <el-checkbox label="法人章"></el-checkbox>
+                    <el-checkbox label="财务章"></el-checkbox>
+                    <el-checkbox label="发票章" ></el-checkbox>
+                    <el-checkbox label="营业执照"></el-checkbox>
+                    <el-checkbox label="开发许可证"></el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">备注</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item class="trightb_item">
+                  <el-input v-model="formobj.remarks" placeholder="请输入项目说明" style="width:100%;margin-bottom: 5px;"
+                    type="textarea" :rows="7" class="addinputw" clearable />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+  
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import req from '@/api/Yjsq/index'
+    import upload from '@/views/Yjsq/upluad.vue'
+    export default {
+      components: {
+        upload
+      },
+      data() {
+        return {
+          title: "【修改】印鉴信息",
+          submitdisabled: false,
+          formobj: {
+            sid:'',
+            project_sid:'', // 项目sid
+            project_name:'', // 项目名称
+            code:'', // 审批编号
+            applicant_date:'',// 申请日期
+            applicant_name:'', // 申请人name
+            user_name:'', // 用印章人姓名
+            user_sid:'',  // 当前登陆人的sid
+            use_date:'', // 使用日期
+            use_reason:'', // 用印章事由
+            use_file_name:'', // 用印文件名称
+            seal_type:'', // 加盖何种公章
+            file_paths:[], // 用印文件（附件）
+            remarks:'', // 备注
+          },
+          industryAllList: [],
+          industryList: [],
+          userSid:'',
+          imgList: [],
+          msg:[],
+          checkList:[],
+          
+        }
+      },
+      created() {
+        var one = window.location.href.indexOf('&data') + 6
+        const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+        const obj = JSON.parse(decodeURIComponent(data))
+        this.showEdit(obj.businessSid)
+        this.formobj.user_sid = window.sessionStorage.getItem('userSid')
+      },
+      watch: {
+       imgList:{
+           deep: true,
+           immediate: true,
+           handler(newVal, oldVal) {
+             const aa=[]
+             for (var i = 0; i < newVal.length; i++) {
+               aa.push(newVal[i].url)
+             }
+             this.formobj.file_paths = aa
+           }
+        },
+    },
+      methods: {
+        saveOrUpdate() {
+          this.backcheckList()
+          if( this.formobj.sid){
+            req.sealrecordSave(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn("true")
+                  this.clearList()
+                } else {
+                  // 根据resp.code进行异常情况处理
+                }
+              })
+              .catch(() => {})
+          }
+          },
+        saveSubmit(){
+          this.backcheckList()
+            req.sealrecordSubmit(this.formobj)
+              .then(resp => {
+                if (resp.success) {
+                  this.$message({
+                    showClose: true,
+                    type: 'success',
+                    message: resp.msg
+                  })
+                  this.handleReturn("true")
+                  this.clearList()
+                } else {
+                }
+              })
+              .catch(() => {})
+        },
+        handleReturn(isreload) {
+          if (isreload === 'true') this.$emit('reloadlist')
+          this.clearList()
+          this.$refs['dataForm'].resetFields()
+          this.$emit('doback')
+        },
+        showEdit(sid) {
+           this.clearList()
+           req.fetchDetailsBySid(sid).then((res)=>{
+            if(res.code==200){
+                this.formobj.project_sid=res.data.project_sid
+                this.formobj.project_name=res.data.project_name
+                this.formobj.sid=res.data.sid
+                this.formobj.project_name=res.data.project_name
+                this.formobj.code=res.data.code
+                this.formobj.applicant_date=res.data.applicant_date
+                this.formobj.applicant_name=res.data.applicant_name
+                this.formobj.user_name=res.data.user_name
+                this.formobj.use_date=res.data.use_date
+                this.formobj.use_reason=res.data.use_reason
+                this.formobj.use_file_name=res.data.use_file_name
+                this.checkList=res.data.seal_type
+                this.formobj.file_paths=res.data.file_paths
+                this.formobj.remarks=res.data.remarks
+                let value=res.data.file_paths
+                for(let i=0;i<value.length;i++){
+                  this.msg.push(value[i])
+                }
+            }
+            }).catch(() => {
+    
+           })
+        },
+       backDatas(value) {
+        const aa = []
+        if (value.length > 0 && value != null && value != undefined) {
+          for (var i = 0; i < value.length; i++) {
+              aa.push(value[i].url)
+            }
+          }
+          this.formobj.file_paths = aa
+        },
+        backcheckList() {
+          var aa = ''
+          for (var i = 0; i < this.checkList.length; i++) {
+              aa+= this.checkList[i]+ ','
+          }
+          var str = aa.slice(0, -1);
+          var List=str.replace(/^,+/, '');
+          this.formobj.seal_type = List
+        },
+        getHangYe(value) {
+           const choose = this.industryList.filter((item) => item.dictKey === value)
+           this.formobj.industryName = choose[0].dictValue
+           this.formobj.industrySid = choose[0].dictKey
+         },
+         clearList() {
+           this.formobj = {
+              sid:'',
+              project_sid:'', 
+              project_name:'', 
+              code:'', 
+              applicant_date:'',
+              applicant_name:'', 
+              user_name:'',
+              use_date:'', 
+              use_reason:'',
+              use_file_name:'',
+              seal_type:'', 
+              file_paths:[],
+              remarks:''
+           };
+           this.checkList=[]
+           this.msg=[]
+           this.imgList=[]
+        },
+  
+      }
+    }
+  </script>
+  <style scoped>
+    .trightb {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  
+    .trightb_item {
+      padding-top: 5px;
+    }
+    .trightbs {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  
+    .span {
+      margin-left: 50px;
+      font-size: 15px;
+      font-weight: 400;
+    }
+  
+    /deep/ .el-collapse-item__header {
+      height: 40px;
+      padding: 10px;
+      font-weight: bold;
+      font-size: 20px;
+      text-align: left;
+      color: #ffffff;
+      background-color: #0294d7;
+    }
+  
+    /deep/ .el-collapse-item__content {
+      padding-bottom: 0;
+    }
+  </style>
+  

supervise-enterprise-ui/src/views/Yjsq/index.vue

@@ -131,6 +131,7 @@
           total: 0,
           viewState: 1,
           sids:'',
+          userSid:'',
           listQuerys: {
             current: 1,
             size: 10,
@@ -233,14 +234,25 @@
         },
         // 打开办理
         toEdit() {
-          if(this.state==''){
+          var usSid=window.sessionStorage.getItem('userSid')
+          if(this.state=='待提交' && this.userSid==usSid || this.state=='用章申请'  && this.userSid==usSid){
             this.viewState = 3
             this.$refs['divAdd'].showEdit(this.sids)
-          }else{
+          }else if(this.state!='待提交' && this.state!='用章申请' && this.userSid==usSid && this.state!=''){
             this.$message({
             message: '已提交，不能继续办理',
             type: 'warning'
            });
+          }else if(this.state=='待提交' && this.userSid!=usSid || this.state=='用章申请'  && this.userSid!=usSid){
+            this.$message({
+            message: '非本人发起的申请，无权限操作',
+            type: 'warning'
+           });
+          }else if(this.state=='终止'){
+            this.$message({
+            message: '该印鉴信息已终止，您无法办理',
+            type: 'warning'
+           });
           }
         },
               /** 流程流转记录 */
@@ -279,10 +291,14 @@
         })
        },
         handleSelectionChange(row) {
+         this.sids = ''
+         this.state = ''
+         this.userSid = ''
          const aa = []
          row.forEach((element) => {
           this.sids = element.sid
           this.state = element.nodeState
+          this.userSid = element.user_sid
          })
          if (row.length > 1) {
          this.$refs.Table.clearSelection()
@@ -293,6 +309,7 @@
         doDel() {
           const sids = []
           sids.push(this.sids)
+          if(this.sids && this.state=='待提交'){
            const tip = '请确认是否删除所选记录?'
            this.$confirm(tip, '提示', {
             confirmButtonText: '确定',
@@ -306,6 +323,17 @@
                }
             })
           })
+          }else if(this.state!='待提交' && this.state!=''){
+            this.$message({
+            message: '已提交的印鉴信息无法删除',
+            type: 'warning'
+           });
+          }else{
+            this.$message({
+            message: '请选择要删除的印鉴信息',
+            type: 'warning'
+           });
+          }
         },
         resetState() {
           this.viewState = 1

supervise-portal-ui/src/store/modules/user.js

@@ -43,8 +43,9 @@ const actions = {
           pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName,
           roleName: data.roleName,
           defaultOrgPathName: data.defaultOrgPathName,
-          defaultOrgPath: data.defaultOrgPath
+          defaultOrgPath: data.defaultOrgPath,
         }
+        let projectSidList=data.projectSidList
         commit('SET_UESRINFO', user)
         window.sessionStorage.setItem('userSid', user.userSid)
         window.sessionStorage.setItem('Orgname', user.Orgname)
@@ -54,6 +55,7 @@ const actions = {
         window.sessionStorage.setItem('roleName', user.roleName)
         window.sessionStorage.setItem('defaultOrgPathName', user.defaultOrgPathName)
         window.sessionStorage.setItem('defaultOrgPath', user.defaultOrgPath)
+        window.sessionStorage.setItem("projectSidList",JSON.stringify(projectSidList));
         resolve(data)
       }).catch(error => {
         reject(error)