From c5a99620ea9f1db873f27885fdd9f54ed40cecaa Mon Sep 17 00:00:00 2001
From: fengdong777 <1478994744@qq.com>
Date: Thu, 14 Sep 2023 17:47:11 +0800
Subject: [PATCH] 9.14

---
 supervise-enterprise-ui/src/utils/axios.js    |  6 +--
 .../src/views/Yjsq/AddYjsq.vue                |  2 +-
 .../src/views/Yjsq/LookYzsq/index.vue         | 10 ++++
 .../src/views/Yjsq/index.vue                  | 53 ++++++++++++++-----
 .../paichanguanli/commission.vue              |  2 +-
 .../src/views/flow/doneList.vue               |  2 +-
 6 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/supervise-enterprise-ui/src/utils/axios.js b/supervise-enterprise-ui/src/utils/axios.js
index 53578374..2902735a 100644
--- a/supervise-enterprise-ui/src/utils/axios.js
+++ b/supervise-enterprise-ui/src/utils/axios.js
@@ -60,7 +60,7 @@ axios.interceptors.response.use(
         break
       case 99:
         if (data.msg !== null) {
-          if (data.msg == '登录状态已过期') {
+          if (data.msg == '') {
             // 未登录
             // removeToken().then(() => { // 清除已登录状态
             //   router.push('/login')
@@ -111,7 +111,7 @@ export const postRequest = (url, params) => {
     url: `${base}${url}`,
     data: params,
     transformRequest: [
-      function(data) {
+      function (data) {
         let ret = ''
         for (const it in data) {
           ret +=
@@ -163,7 +163,7 @@ export const putRequest = (url, params) => {
     url: `${base}${url}`,
     data: params,
     transformRequest: [
-      function(data) {
+      function (data) {
         let ret = ''
         for (const it in data) {
           ret +=
diff --git a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
index b4a13871..d1daa6ab 100644
--- a/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
+++ b/supervise-enterprise-ui/src/views/Yjsq/AddYjsq.vue
@@ -23,7 +23,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item class="trightb_item">
-                  <el-select v-model="formobj.orgDeptName"  placeholder="请选择" @change="changeOrgDept" clearable >
+                  <el-select v-model="formobj.materiel_group"  placeholder="请选择" clearable >
                   <el-option v-for="(item,i) in projectSidList" :key="i" :label="item.entryName" :value="item.entryName"></el-option>
                 </el-select>
                 </el-form-item>
diff --git a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue
index 7e20d40d..f3c4182a 100644
--- a/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue
+++ b/supervise-enterprise-ui/src/views/Yjsq/LookYzsq/index.vue
@@ -228,6 +228,16 @@
            }
         },
     },
+       mounted() {
+       window.parent.postMessage({
+         cmd: 'returnHeight',
+         params: {
+           // 告诉父级页面，子页面的弹框高度。
+           code: 2,
+           data: 475 + 'px'
+         }
+       }, '*')
+     },
       methods: {
         saveOrUpdate() {
           this.formobj.user_sid = window.sessionStorage.getItem('userSid')
diff --git a/supervise-enterprise-ui/src/views/Yjsq/index.vue b/supervise-enterprise-ui/src/views/Yjsq/index.vue
index f24663c8..6c1931e9 100644
--- a/supervise-enterprise-ui/src/views/Yjsq/index.vue
+++ b/supervise-enterprise-ui/src/views/Yjsq/index.vue
@@ -7,8 +7,20 @@
             <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
             <div v-show="isSearchShow" class="search">
               <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
-                <el-form-item label="油罐编号">
-                  <el-input v-model="listQuery.params.number" maxlength="20" placeholder="请输入油罐编号" class="addinputw"
+                <el-form-item label="项目名称">
+                  <el-input v-model="listQuery.params.project_name" maxlength="20" placeholder="请输入项目名称" class="addinputw"
+                    clearable />
+                </el-form-item>
+                <el-form-item label="审批编号">
+                  <el-input v-model="listQuery.params.code" maxlength="20" placeholder="请输入审批编号" class="addinputw"
+                    clearable />
+                </el-form-item>
+                <el-form-item label="申请人">
+                  <el-input v-model="listQuery.params.applicant_name" maxlength="20" placeholder="请输入申请人" class="addinputw"
+                    clearable />
+                </el-form-item>
+                <el-form-item label="用印人">
+                  <el-input v-model="listQuery.params.user_name" maxlength="20" placeholder="请输入用印人" class="addinputw"
                     clearable />
                 </el-form-item>
               </el-form>
@@ -125,7 +137,10 @@
             current: 1,
             size: 10,
             params: {
-              entryName: '',
+              project_name: '',
+              code: '',
+              applicant_name: '',
+              user_name:''
             },
           },
           total: 0,
@@ -215,7 +230,10 @@
             current: 1,
             size: 10,
             params: {
-              entryName: ""
+              project_name: "",
+              code: "",
+              applicant_name: "",
+              user_name:''
             }
           }
           this.total=0,
@@ -238,11 +256,6 @@
           if(this.state=='待提交' && this.userSid==usSid || this.state=='用章申请'  && this.userSid==usSid){
             this.viewState = 3
             this.$refs['divAdd'].showEdit(this.sids)
-          }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: '非本人发起的申请，无权限操作',
@@ -253,6 +266,16 @@
             message: '该印鉴信息已终止，您无法办理',
             type: 'warning'
            });
+          }else if(this.state=='已办结'){
+            this.$message({
+            message: '已办结，您无法办理',
+            type: 'warning'
+           });
+          }else if(this.state=='监管公司审核' || this.state=='银行审批'){
+            this.$message({
+            message: '已提交，不能继续办理',
+            type: 'warning'
+           });
           }
         },
               /** 流程流转记录 */
@@ -307,9 +330,10 @@
        },
         // 根据本行ID删除数据
         doDel() {
+          var usSid=window.sessionStorage.getItem('userSid')
           const sids = []
           sids.push(this.sids)
-          if(this.sids && this.state=='待提交'){
+          if(this.sids && this.state=='待提交' && this.userSid==usSid){
            const tip = '请确认是否删除所选记录?'
            this.$confirm(tip, '提示', {
             confirmButtonText: '确定',
@@ -325,14 +349,19 @@
           })
           }else if(this.state!='待提交' && this.state!=''){
             this.$message({
-            message: '已提交的印鉴信息无法删除',
+            message: '删除的数据中包含已经提交审批的数据，删除失败',
             type: 'warning'
            });
-          }else{
+          }else if(this.state==''){
             this.$message({
             message: '请选择要删除的印鉴信息',
             type: 'warning'
            });
+          }else if(this.sids && this.state=='待提交' && this.userSid!=usSid){
+            this.$message({
+            message: '非本人发起的申请，无权限操作',
+            type: 'warning'
+           });
           }
         },
         resetState() {
diff --git a/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue b/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue
index 7cbfe3eb..231f4f31 100644
--- a/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue
+++ b/supervise-enterprise-ui/src/views/paichanguanliFlow/paichanguanli/commission.vue
@@ -8,7 +8,7 @@
         <!--start 添加修改按钮-->
         <div>
           <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <!-- <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button> -->
           <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
         </div>
       </div>
diff --git a/supervise-portal-ui/src/views/flow/doneList.vue b/supervise-portal-ui/src/views/flow/doneList.vue
index b06c10c9..b62da4fd 100644
--- a/supervise-portal-ui/src/views/flow/doneList.vue
+++ b/supervise-portal-ui/src/views/flow/doneList.vue
@@ -273,7 +273,7 @@ import flowRecords from '@/components/flow/flowRecord'
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.success && response.data.url !== '') {
             // this.url = 'http://127.0.0.1:9531' + '/production/#/paichanguanli/haveDone' + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
-             this.url = "http://supervise.yxtsoft.com"+ response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
+             this.url = ''+ response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
             // this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
           } else if (response.success && response.data.url === '') {
             this.$notify({