会计模块列表页面调整管理员权限、报告管理调整

src/views/modules/cw/invoice/ContractForm.vue

@@ -8,6 +8,7 @@
       height="500px"
       @close="close"
       @keyup.enter.native=""
+      append-to-body
       :visible.sync="visible">
       <div style="height: calc(100% - 80px);">
         <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>

src/views/modules/cw/invoice/InvoiceList.vue

@@ -242,6 +242,11 @@
           </vxe-column>
           <vxe-column min-width="300" title="操作"  fixed="right" align="center">
             <template  slot-scope="scope">
+              <div v-if="isAdmin">
+                <el-button v-if="(scope.row.status === '5')" type="text"  size="small" @click="editForm(scope.row.id)">修改</el-button>
+                <el-button v-if="(scope.row.status === '5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              </div>
+              <div v-else>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '1'||scope.row.status === '3')" type="text"  size="small" @click="invoicePush(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status === '2'" type="text"  size="small" @click="invoiceReback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:detail')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" type="text"  size="small" @click="editDetail(scope.row.id)">修改发票明细</el-button>
@@ -259,6 +264,7 @@
               <el-button v-if="scope.row.status==='6' && checkIsAuditInvalid(scope.row)" type="text"  size="small" @click="examineInvalid(scope.row)">作废审核</el-button>
 <!--              被驳回后当前申请人重新调整  发票作废-->
               <el-button v-if="scope.row.createBy.id === $store.state.user.id&&scope.row.status === '8'" type="text"  size="small" @click="adjustInvalid(scope.row)">驳回调整</el-button>
+              </div>
             </template>
           </vxe-column>
         </vxe-table>
@@ -277,6 +283,7 @@
     <InvoiceForm  ref="invoiceForm" @refreshDataList="refreshList"></InvoiceForm>
     <ProgramPageForm ref="programPageForm" @getProgram="getProgram"></ProgramPageForm>
     <ProgramForm ref="programForm"></ProgramForm>
+    <InvoiceUpdateForm ref="invoiceUpdateForm" @refreshDataList="refreshList"></InvoiceUpdateForm>
   </div>
 </template>
 
@@ -292,6 +299,7 @@
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import ProgramPageForm from '@/views/modules/finance/invoice/ProgramPageForm'
+  import InvoiceUpdateForm from './InvoiceUpdateForm'
   export default {
     data () {
       return {
@@ -325,7 +333,8 @@
         processDefinitionId: '',
         procDefKey: '',
         processDefinitionInvalidId: '',
-        procDefInvalidKey: ''
+        procDefInvalidKey: '',
+        isAdmin: false
       }
     },
     financeInvoiceService: null,
@@ -349,7 +358,8 @@
       SelectUserTree,
       SelectTree,
       ProgramPageForm,
-      ProgramForm
+      ProgramForm,
+      InvoiceUpdateForm
     },
     mounted () {
       this.refreshList()
@@ -369,10 +379,19 @@
           this.showHideName = '展示'
         }
       },
+      // 查询当前用户是否是管理员用户
+      checkIsAdmin () {
+        this.userService.is().then(({data}) => {
+          this.isAdmin = data
+        })
+      },
       // 新增
       add () {
         this.$refs.invoiceForm.init('add', '')
       },
+      editForm (id) {
+        this.$refs.invoiceUpdateForm.init('edit', id)
+      },
       // 修改发票明细
       editDetail (id) {
         id = id || this.$refs.invoiceTable.getCheckboxRecords().map(item => {
@@ -460,6 +479,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
+        this.checkIsAdmin()
         this.processService.getByName('会计-发票申请').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id

src/views/modules/cw/invoice/ProgramForm.vue

@@ -6,6 +6,7 @@
       v-dialogDrag
       width="1300px"
       @close="close"
+      append-to-body
       @keyup.enter.native="doSubmit"
       :visible.sync="visible">
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"

src/views/modules/cw/invoice/ProgramPageForm.vue

@@ -7,6 +7,7 @@
       width="1100px"
       height="500px"
       @close="close"
+      append-to-body
       @keyup.enter.native=""
       :visible.sync="visible">
       <div v-if="isShow">

src/views/modules/cw/invoice/WorkClientForm.vue

@@ -7,6 +7,7 @@
       width="1100px"
       height="500px"
       @close="close"
+      append-to-body
       @keyup.enter.native=""
       :visible.sync="visible">
       <div style="height: calc(100% - 80px);">

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -184,8 +184,11 @@
           </vxe-column>
           <vxe-column title="操作" width="100px" fixed="right" align="center">
             <template  slot-scope="scope">
+              <div v-if="isAdmin">
+                <el-button v-if="scope.row.status==='5'" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+              </div>
+              <div v-else>
               <el-button v-if="hasPermission('cwProjectReportArchive:edit')&&(scope.row.createBy.id === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&(scope.row.status==='0'||scope.row.status==='1'||scope.row.status==='3')" type="text"  size="small" @click="push(scope.row)">归档</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReportArchive:edit')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-if="hasPermission('cwProjectReportArchive:edit')&&(scope.row.createBy.id === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
 <!--              <el-button v-if="hasPermission('cwProjectReportArchive:del')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>-->
 <!--              <el-button v-else-if="hasPermission('cwProjectReportArchive:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='5'||scope.row.status==='4')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>-->
@@ -193,6 +196,7 @@
               <el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" type="text"  size="small" @click="examine(scope.row)">审核</el-button>
 <!--              被驳回后当前申请人重新调整-->
               <el-button v-if="scope.row.createBy.id === $store.state.user.id&&scope.row.status === '4'" type="text"  size="small" @click="adjust(scope.row)">驳回调整</el-button>
+              </div>
             </template>
           </vxe-column>
         </vxe-table>

src/views/modules/cw/reimbursementApproval/info/CwProgramPageForm.vue

@@ -7,6 +7,7 @@
       width="1100px"
       height="500px"
       @close="close"
+      append-to-body
       @keyup.enter.native=""
       :visible.sync="visible">
       <div v-if="isShow">

src/views/modules/cw/reimbursementApproval/info/CwReimbursementTypePullForm.vue

@@ -6,6 +6,7 @@
       v-dialogDrag
       width="1100px"
       height="500px"
+      append-to-body
       @close="close"
       @keyup.enter.native=""
       :visible.sync="visible">

src/views/modules/cw/reimbursementApproval/info/InfoForm.vue

@@ -6,6 +6,7 @@
       v-dialogDrag
       width="1200px"
       @close="close"
+      append-to-body
       @keyup.enter.native="doSubmit"
       :visible.sync="visible">
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"

src/views/modules/cw/reimbursementApproval/info/InfoList.vue

@@ -161,6 +161,11 @@
 
           <vxe-column title="操作" width="130px" fixed="right" align="center">
             <template  slot-scope="scope">
+              <div v-if="isAdmin">
+                <el-button v-if=" (scope.row.type === '5' )" type="text"  size="small" @click="editForm(scope.row)">修改</el-button>
+                <el-button v-if=" (scope.row.type === '5')" type="text"  size="small" @click="del(scope.row.id)">删除</el-button>
+              </div>
+              <div v-else>
               <el-button v-if="hasPermission('cw:reimbursement:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '1' || scope.row.type === '3' )" type="text"  size="small" @click="edit(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('cw:reimbursement:info:edit') && scope.row.createId === $store.state.user.id && (scope.row.type === '2')" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('cw:reimbursement:info:del') && scope.row.createId === $store.state.user.id && (scope.row.type === '1')" type="text"  size="small" @click="del(scope.row.id)">删除</el-button>
@@ -168,6 +173,7 @@
               <el-button v-if="scope.row.type==='2' && checkIsAudit(scope.row)" type="text"  size="small" @click="examine(scope.row)">审核</el-button>
 <!--              被驳回后当前申请人重新调整-->
               <el-button v-if="scope.row.createId === $store.state.user.id&&scope.row.type === '4'" type="text"  size="small" @click="adjust(scope.row)">驳回调整</el-button>
+              </div>
             </template>
           </vxe-column>
         </vxe-table>
@@ -188,6 +194,7 @@
 <!--        <ProjectForm ref="projectForm" @refreshDataList="refreshList"></ProjectForm>-->
         <ProjectRecordsForm ref="projectRecordsForm" @refreshDataList="refreshList"></ProjectRecordsForm>
         <ContractNameForm ref="contractNameForm"></ContractNameForm>
+        <InfoUpdateForm ref="infoUpdateForm" @refreshDataList="refreshList"></InfoUpdateForm>
       </div>
     </div>
   </div>
@@ -209,6 +216,8 @@
   // import ProjectForm from '@/views/modules/program/registered/ProjectForm'
   import ProjectRecordsForm from '../../projectRecords/ProjectRecordsForm'
   import ContractNameForm from '../../workContract/ContractNameForm'
+  import UserService from '@/api/sys/UserService'
+  import InfoUpdateForm from './InfoUpdateForm'
   export default {
     data () {
       return {
@@ -237,18 +246,21 @@
           pageSize: 10,
           orders: []
         },
-        loading: false
+        loading: false,
+        isAdmin: false
       }
     },
     // reimbursementService: null,
     reimbursementApprovalService: null,
     taskService: null,
     processService: null,
+    userService: null,
     created () {
       // this.reimbursementService = new ReimbursementService()
       this.reimbursementApprovalService = new ReimbursementApprovalService()
       this.taskService = new TaskService()
       this.processService = new ProcessService()
+      this.userService = new UserService()
     },
     components: {
       InputNumber,
@@ -260,7 +272,8 @@
       // ProjectForm,
       ProjectRecordsForm,
       UserSelect,
-      ContractNameForm
+      ContractNameForm,
+      InfoUpdateForm
     },
     mounted () {
       this.refreshList()
@@ -290,6 +303,12 @@
           this.showHideName = '展示'
         }
       },
+      // 查询当前用户是否是管理员用户
+      checkIsAdmin () {
+        this.userService.is().then(({data}) => {
+          this.isAdmin = data
+        })
+      },
       viewContract (id) {
         this.$refs.contractNameForm.init('view', id)
       },
@@ -377,6 +396,9 @@
       view (id) {
         this.$refs.infoForm.init('view', id)
       },
+      editForm (row) {
+        this.$refs.infoUpdateForm.init('edit', row.id)
+      },
       // 查看报销项目
       viewProject (id) {
         // this.$refs.projectForm.init('view', id)
@@ -395,6 +417,7 @@
           this.tablePage.total = data.total
           this.loading = false
         })
+        this.checkIsAdmin()
         // this.reimbursementService.list({
         //   'current': this.tablePage.currentPage,
         //   'size': this.tablePage.pageSize,

src/views/modules/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -535,7 +535,7 @@
           </vxe-table-column>
           <vxe-table-column field="count" title="价税合计" :edit-render="{}">
             <template v-slot:edit="scope">
-              <el-input disabled="true" v-model="scope.row.count" ></el-input>
+              <el-input :disabled="true" v-model="scope.row.count" ></el-input>
             </template>
           </vxe-table-column>
           <vxe-table-column title="操作" width="100">

src/views/modules/cw/reimbursementApproval/type/TypeForm.vue

@@ -6,6 +6,7 @@
       v-dialogDrag
       width="500px"
       @close="close"
+      append-to-body
       @keyup.enter.native="doSubmit"
       :visible.sync="visible">
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"

src/views/modules/cw/reportManagement/ReportManagementAddForm.vue

@@ -205,6 +205,36 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="所属行业" prop="industry"
+                          :rules="[
+                            {required: true, message:'所属行业不能为空', trigger:'change'}
+                   ]">
+              <el-select v-model="inputForm.industry" placeholder="请选择所属行业" style="width:100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_industry')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务对象" prop="businessObjects"
+                          :rules="[
+                            {required: true, message:'业务对象不能为空', trigger:'change'}
+                   ]">
+              <el-select v-model="inputForm.businessObjects" placeholder="请选择业务对象" style="width:100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_business_objects')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="业务类型" prop="businessType"
                           :rules="[
                             {required: true, message:'业务类型不能为空', trigger:'change'}
@@ -571,7 +601,9 @@
           servedUnitId: '',
           status: '',
           realCreate: '',
-          realHeaderName: ''
+          realHeaderName: '',
+          industry: '',
+          businessObjects: ''
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -740,7 +772,9 @@
           projectMasterId2: '',
           cwProjectInfoList: [],
           realCreate: '',
-          realHeaderName: ''
+          realHeaderName: '',
+          industry: '',
+          businessObjects: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1073,7 +1107,9 @@
           servedUnitId: '',
           status: '',
           realCreate: '',
-          realHeaderName: ''
+          realHeaderName: '',
+          industry: '',
+          businessObjects: ''
         }
         this.$refs.enclosure.clearUpload()
         // this.$refs.archiveFile.clearUpload()

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -205,6 +205,36 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
+                <el-form-item label="所属行业" prop="industry"
+                              :rules="[
+                            {required: true, message:'所属行业不能为空', trigger:'change'}
+                   ]">
+                  <el-select v-model="inputForm.industry" placeholder="请选择所属行业" style="width:100%;">
+                    <el-option
+                      v-for="item in $dictUtils.getDictList('cw_industry')"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="业务对象" prop="businessObjects"
+                              :rules="[
+                            {required: true, message:'业务对象不能为空', trigger:'change'}
+                   ]">
+                  <el-select v-model="inputForm.businessObjects" placeholder="请选择业务对象" style="width:100%;">
+                    <el-option
+                      v-for="item in $dictUtils.getDictList('cw_business_objects')"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
                 <el-form-item label="业务类型" prop="businessType"
                               :rules="[
                             {required: true, message:'业务类型不能为空', trigger:'blur'}
@@ -940,7 +970,9 @@
           status: '',
           realCreate: '',
           realHeaderName: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -1096,7 +1128,9 @@
           status: '',
           realCreate: '',
           realHeaderName: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1255,6 +1289,7 @@
                 this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
                 this.reportReviewService.save(this.inputForm).then(() => {
                   this.projectReportService.saveForm(this.inputForm).then(() => {
+                    this.$emit('refreshList')
                     this.close()
                     this.loading = false
                   }).catch(() => {
@@ -1369,7 +1404,9 @@
           contractId: '',
           realCreate: '',
           realHeaderName: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -34,6 +34,16 @@
       <el-form-item v-if="showHideItem" label="审计收费(税前、元)" prop="contractAmounts">
         <InputNumber :disabled="false" :precision="num" v-model="searchForm.contractAmounts"></InputNumber>
       </el-form-item>
+      <el-form-item v-if="showHideItem" label="报备类型" prop="filingType">
+        <el-select v-model="searchForm.filingType" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="showHideItem" label="复核状态" prop="reviewStatus">
         <el-select v-model="searchForm.reviewStatus" placeholder="请选择" style="width:100%;">
           <el-option
@@ -154,58 +164,72 @@
 
           <vxe-column title="操作" width="200px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="isAdmin && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReport:edit')&&
+              <div v-if="isAdmin">
+                <el-button v-if="
+                      scope.row.reviewStatus === '5'&&(
+                          (scope.row.signatureType === '1' && (scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3')) ||
+                          (scope.row.signatureType === '2' && (scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3')) ||
+                          (scope.row.signatureType === '3' && (scope.row.status3 === '0'||scope.row.status3 === '1'||scope.row.status3 === '3'))
+                      )" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+                <el-button v-if="
+                      scope.row.reviewStatus === '5'&&(
+                          (scope.row.signatureType === '1' && (scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3')) ||
+                          (scope.row.signatureType === '2' && (scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3')) ||
+                          (scope.row.signatureType === '3' && (scope.row.status3 === '0'||scope.row.status3 === '1'||scope.row.status3 === '3'))
+                      )" type="text"  size="small" @click="del(scope.row.id)">删除</el-button>
+                <!-- 签章撤回 (只有管理员在签章完成后可使用此功能)-->
+                <el-button v-if="(
+                                  (scope.row.signatureType === '1' && scope.row.status1 === '5') ||
+                                  (scope.row.signatureType === '2' && scope.row.status2 === '5') ||
+                                  (scope.row.signatureType === '3' && scope.row.status3 === '5')
+                                  )"
+                           type="text" size="small" @click="rebackSign(scope.row)">撤回签章</el-button>
+              </div>
+              <div v-else>
+                <el-button v-if="hasPermission('cwProjectReport:edit')&&
                               (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
                               (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))"
-                         type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+                           type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
 
-              <el-button v-if="isAdmin && (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-else-if="hasPermission('cwProjectReport:del')&&
-                              (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId))&&
+                <el-button v-else-if="hasPermission('cwProjectReport:del')&&
+                              (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId))&&
                               scope.row.status === '5'&&
                               (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3'  || commonJS.isEmpty(scope.row.reviewStatus))"
-                         type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
-<!--              审核-->
-              <el-button v-if="scope.row.reviewStatus==='2' && checkIsAuditReview(scope.row)" type="text"  size="small" @click="examineReview(scope.row)">审核</el-button>
-<!--              被驳回后当前申请人重新调整-->
-              <el-button v-if="hasPermission('cw:workContract:filed')&&scope.row.createById === $store.state.user.id&&scope.row.reviewStatus === '4'" type="text"  size="small" @click="adjustReview(scope.row)">驳回调整</el-button>
-<!--              复核流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.reviewStatus === '2'" type="text" size="small" @click="rebackF(scope.row)">撤回复核申请</el-button>
-<!--              未选择盖章类型点击签章操作-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && !scope.row.signatureType" type="text" size="small" @click="pushS(scope.row)">签章</el-button>
-              <!--公章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">签章</el-button>
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
-<!--              实体章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">签章</el-button>
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '2' || scope.row.status3 === '6' || scope.row.status3 === '7')" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
-<!--              公章+执业章流程-->
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
-              <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||isAdmin||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '2' || scope.row.status2 === '6' || scope.row.status2 === '7')" type="text" size="small" @click="rebackS2(scope.row)">撤回签章申请</el-button>
-<!--              签章撤回 (只有管理员在签章完成后可使用此功能)-->
-              <el-button v-if="(
-                                (scope.row.signatureType === '1' && scope.row.status1 === '5') ||
-                                (scope.row.signatureType === '2' && scope.row.status2 === '5') ||
-                                (scope.row.signatureType === '3' && scope.row.status3 === '5')
-                                ) && isAdmin" type="text" size="small" @click="rebackSign(scope.row)">撤回签章</el-button>
-<!--              签章  审核-->
-              <el-button v-if="(
+                           type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+                <!--              审核-->
+                <el-button v-if="scope.row.reviewStatus==='2' && checkIsAuditReview(scope.row)" type="text"  size="small" @click="examineReview(scope.row)">审核</el-button>
+                <!--              被驳回后当前申请人重新调整-->
+                <el-button v-if="hasPermission('cw:workContract:filed')&&scope.row.createById === $store.state.user.id&&scope.row.reviewStatus === '4'" type="text"  size="small" @click="adjustReview(scope.row)">驳回调整</el-button>
+                <!--              复核流程-->
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& (scope.row.reviewStatus === '0' || scope.row.reviewStatus === '1' || scope.row.reviewStatus === '3' || scope.row.reviewStatus === undefined || scope.row.reviewStatus === '')" type="text" size="small" @click="pushF(scope.row)">复核</el-button>
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5'&& scope.row.reviewStatus === '2'" type="text" size="small" @click="rebackF(scope.row)">撤回复核申请</el-button>
+                <!--              未选择盖章类型点击签章操作-->
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && !scope.row.signatureType" type="text" size="small" @click="pushS(scope.row)">签章</el-button>
+                <!--公章流程-->
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && (scope.row.status1 === '0' || scope.row.status1 === '3')" type="text" size="small" @click="pushS(scope.row)">签章</el-button>
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '1' && scope.row.status1 === '2'" type="text" size="small" @click="rebackS(scope.row)">撤回签章申请</el-button>
+                <!--              实体章流程-->
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '0' || scope.row.status3 === '3')" type="text" size="small" @click="pushS3(scope.row)">签章</el-button>
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '3' && (scope.row.status3 === '2' || scope.row.status3 === '6' || scope.row.status3 === '7')" type="text" size="small" @click="rebackS3(scope.row)">撤回签章申请</el-button>
+                <!--              公章+执业章流程-->
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '0' || scope.row.status2 === '3')" type="text" size="small" @click="pushS2(scope.row)">公章+执业章</el-button>
+                <el-button v-if="hasPermission('cw:workContract:filed') && (scope.row.createById === $store.state.user.id||haveProjectIds.includes(scope.row.projectId)) && scope.row.status === '5' && scope.row.reviewStatus === '5' && scope.row.signatureType === '2' && (scope.row.status2 === '2' || scope.row.status2 === '6' || scope.row.status2 === '7')" type="text" size="small" @click="rebackS2(scope.row)">撤回签章申请</el-button>
+                <!--              签章  审核-->
+                <el-button v-if="(
                           (scope.row.signatureType === '1' && scope.row.status1 === '2') ||
                           (scope.row.signatureType === '2' && scope.row.status2 === '2') ||
                           (scope.row.signatureType === '3' && scope.row.status3 === '2')
                           )
                           && checkIsAuditSign(scope.row)" @click="examineSign(scope.row)"  type="text"  size="small" >审核</el-button>
-<!--              签章  被驳回后当前申请人重新调整-->
-              <el-button v-if="(
+                <!--              签章  被驳回后当前申请人重新调整-->
+                <el-button v-if="(
                           (scope.row.signatureType === '1' && scope.row.status1 === '4') ||
                           (scope.row.signatureType === '2' && scope.row.status2 === '4') ||
                           (scope.row.signatureType === '3' && scope.row.status3 === '4')
                           )
                           && scope.row.createById === $store.state.user.id" @click="adjustSign(scope.row)"   type="text"  size="small">驳回调整</el-button>
-
+              </div>
             </template>
           </vxe-column>
         </vxe-table>
@@ -259,7 +283,8 @@
           createBy: '',
           contractDates: [],
           projectMasterName: '', // 项目经理1
-          realHeaderName: '' // 项目经理2
+          realHeaderName: '', // 项目经理2
+          filingType: ''
         },
         dataList: [],
         tablePage: {

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -210,6 +210,36 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="所属行业" prop="industry"
+                          :rules="[
+                            {required: true, message:'所属行业不能为空', trigger:'change'}
+                   ]">
+              <el-select v-model="inputForm.industry" placeholder="请选择所属行业" style="width:100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_industry')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务对象" prop="businessObjects"
+                          :rules="[
+                            {required: true, message:'业务对象不能为空', trigger:'change'}
+                   ]">
+              <el-select v-model="inputForm.businessObjects" placeholder="请选择业务对象" style="width:100%;">
+                <el-option
+                  v-for="item in $dictUtils.getDictList('cw_business_objects')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="业务类型" prop="businessType"
                           :rules="[
                    ]">
@@ -584,7 +614,9 @@
           procDefId: '',
           procDefKey: '',
           formTitle: '',
-          title: ''
+          title: '',
+          industry: '',
+          businessObjects: ''
         },
         keyWatch: '',
         activeName: 'archiveFile',
@@ -799,7 +831,9 @@
           formTitle: '',
           title: '',
           projectMasterId1: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1459,7 +1493,9 @@
           taskName: '',
           realHeaderName: '',
           projectMasterId1: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -186,8 +186,39 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="所属行业" prop="industry"
+                            :rules="[
+                            {required: true, message:'所属行业不能为空', trigger:'change'}
+                   ]">
+                <el-select v-model="inputForm.industry" placeholder="请选择所属行业" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_industry')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="业务对象" prop="businessObjects"
+                            :rules="[
+                            {required: true, message:'业务对象不能为空', trigger:'change'}
+                   ]">
+                <el-select v-model="inputForm.businessObjects" placeholder="请选择业务对象" style="width:100%;">
+                  <el-option
+                    v-for="item in $dictUtils.getDictList('cw_business_objects')"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="业务类型" prop="businessType"
                             :rules="[
+                            {required: true, message:'业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select @change="changeBusinessType" v-model="inputForm.businessType" placeholder="请选择业务类型" style="width:100%;">
                   <el-option
@@ -202,6 +233,7 @@
             <el-col :span="12" v-if="inputForm.businessType === '1'">
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
+                            {required: true, message:'审计业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
@@ -216,6 +248,7 @@
             <el-col :span="12" v-if="inputForm.businessType === '2'">
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
+                            {required: true, message:'审计业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
@@ -230,6 +263,7 @@
             <el-col :span="12" v-if="inputForm.businessType === '3'">
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
+                            {required: true, message:'审计业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
@@ -244,6 +278,7 @@
             <el-col :span="12" v-if="inputForm.businessType === '4'">
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
+                            {required: true, message:'审计业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select  v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
@@ -258,6 +293,7 @@
             <el-col :span="12" v-if="inputForm.businessType === '5'">
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
+                            {required: true, message:'审计业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
@@ -272,6 +308,7 @@
             <el-col :span="12" v-if="inputForm.businessType === '6'">
               <el-form-item label="审计业务类型" prop="auditBusinessType"
                             :rules="[
+                            {required: true, message:'审计业务类型不能为空', trigger:'change'}
                    ]">
                 <el-select v-model="inputForm.auditBusinessType" placeholder="请选择审计业务类型" style="width:100%;">
                   <el-option
@@ -699,7 +736,9 @@
           taskName: '',
           realHeaderName: '',
           projectMasterId1: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -840,7 +879,9 @@
           taskName: '',
           realHeaderName: '',
           projectMasterId1: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -1162,7 +1203,9 @@
           tableKeyClient: '1',
           realHeaderName: '',
           projectMasterId1: '',
-          projectMasterId2: ''
+          projectMasterId2: '',
+          industry: '',
+          businessObjects: ''
         }
         this.reviewBys = []
         // this.$refs.uploadComponent.clearUpload()

src/views/modules/cw/workClientInfo/WorkClientAddForm.vue

@@ -707,8 +707,8 @@
         </el-col>
       </el-row>
       <span slot="footer" class="dialog-footer">
-      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
-      <el-button size="small" v-if="method === 'edit' || method === 'add'" type="primary" icon="el-icon-circle-check" @click="save()">确定</el-button>
+      <el-button size="small" :loading="loading" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" :loading="loading" v-if="method === 'edit' || method === 'add'" type="primary" icon="el-icon-circle-check" @click="save()">确定</el-button>
     </span>
     </el-dialog>
       <WorkClientListForm ref="workClientListForm" @getWorkClient="getWorkClient"></WorkClientListForm>

src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -169,22 +169,28 @@
           </vxe-column>
           <vxe-column title="操作" width="140px" fixed="right" align="center">
             <template  slot-scope="scope">
-<!--              拥有人修改-->
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.updateUser === $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
-<!--              其他人修改-->
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.updateUser !== $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
-<!--              审核-->
-              <el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" type="text"  size="small" @click="examine(scope.row)">审核</el-button>
-<!--              被驳回后当前申请人重新调整-->
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status === '4'" type="text"  size="small" @click="adjust(scope.row)">驳回调整</el-button>
-<!--              当前申请人撤回-->
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
-<!--              当前申请人撤回后->申请修改-->
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
-<!--              当前申请人撤回后->取消修改申请-->
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="stopUpdate(scope.row.id)">取消修改</el-button>
-<!--              拥有人删除-->
-              <el-button v-if="hasPermission('cw_work_client:info:del')&&scope.row.updateUser === $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              <div v-if="isAdmin">
+                <el-button v-if="(scope.row.status==='0'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+                <el-button v-if="(scope.row.status==='0'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              </div>
+              <div v-else>
+                <!--              拥有人修改-->
+                <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.updateUser === $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"  size="small" @click="edit(scope.row.id)">修改</el-button>
+                <!--              其他人修改-->
+                <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.updateUser !== $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
+                <!--              审核-->
+                <el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" type="text"  size="small" @click="examine(scope.row)">审核</el-button>
+                <!--              被驳回后当前申请人重新调整-->
+                <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status === '4'" type="text"  size="small" @click="adjust(scope.row)">驳回调整</el-button>
+                <!--              当前申请人撤回-->
+                <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
+                <!--              当前申请人撤回后->申请修改-->
+                <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
+                <!--              当前申请人撤回后->取消修改申请-->
+                <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.requestUserId === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="stopUpdate(scope.row.id)">取消修改</el-button>
+                <!--              拥有人删除-->
+                <el-button v-if="hasPermission('cw_work_client:info:del')&&scope.row.updateUser === $store.state.user.id&&(scope.row.status==='0'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
+              </div>
             </template>
           </vxe-column>
         </vxe-table>
@@ -381,7 +387,11 @@
         }).then(() => {
           this.loading = true
           this.workClientService.delete(ids).then(({data}) => {
-            this.$message.success(data)
+            if (data === '删除成功') {
+              this.$message.success(data)
+            } else {
+              this.$message.error(data)
+            }
             this.refreshList()
             this.loading = false
           })

src/views/modules/cw/workContract/ContractRegistration.vue

@@ -172,10 +172,14 @@
 
           <vxe-column title="操作" min-width="200px" fixed="right" align="center">
             <template  slot-scope="scope">
+              <div v-if="isAdmin">
+                <el-button v-if="scope.row.filedPaperType === '5'" type="text" size="small" @click="edit(scope.row)">修改</el-button>
+                <el-button v-if="scope.row.filedPaperType === '5'" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
+              </div>
+              <div v-else>
 <!--              <el-button v-if="hasPermission('cw:workContract:view')" type="text" size="small" @click="view(scope.row.id)">查看</el-button>-->
               <el-button v-if="hasPermission('cw:workContract:edit') && (scope.row.createId === $store.state.user.id) &&
-              (scope.row.filedPaperType !== '2' && scope.row.filedPaperType !== '5')" type="text" size="small" @click="edit(scope.row)">修改</el-button>
-              <el-button v-else-if="isAdmin" type="text" size="small" @click="edit(scope.row)">修改</el-button>
+              (scope.row.filedPaperType !== '2' && scope.row.filedPaperType !== '5'&& scope.row.filedPaperType !== '4')" type="text" size="small" @click="edit(scope.row)">修改</el-button>
 <!--              <el-button v-if="hasPermission('cw:workContract:edit') && scope.row.status === '5' && isAdmin && (scope.row.filedPaperType === '0' || scope.row.filedPaperType === '1' || scope.row.filedPaperType === '3')" type="text" size="small" @click="editForm(scope.row.id)">修改</el-button>-->
               <!--<el-button v-else-if="hasPermission('cw:workContract:edit') && scope.row.status === '5' && scope.row.createId === $store.state.user.id && (scope.row.filedPaperType === '0' || scope.row.filedPaperType === '1' || scope.row.filedPaperType === '3' || commonJS.isEmpty(scope.row.filedPaperType))" type="text" size="small" @click="editForm(scope.row.id)">修改</el-button>-->
               <!--              审核-->
@@ -183,7 +187,7 @@
               <!--              被驳回后当前申请人重新调整-->
 <!--              <el-button v-if="hasPermission('cw:workContract:edit')&&scope.row.createId === $store.state.user.id&&scope.row.status === '4'" type="text"  size="small" @click="adjust(scope.row)">驳回调整</el-button>-->
               <!--              <el-button v-if="hasPermission('cw:workContract:edit') && scope.row.status === '5' && scope.row.filedType === '5' && scope.row.filedPaperType === '5' && isAdmin" type="text" size="small" @click="editForm(scope.row.id)">修改</el-button>-->
-              <el-button v-if="hasPermission('cw:workContract:del') && (scope.row.status === '1' || scope.row.status === '3')  && scope.row.createId === $store.state.user.id" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('cw:workContract:del') && (scope.row.filedPaperType === '1' || scope.row.filedPaperType === '3' || scope.row.filedPaperType === '0')  && scope.row.createId === $store.state.user.id" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
               <el-button v-if="hasPermission('cw:workContract:back') && scope.row.status === '2' && scope.row.createId === $store.state.user.id" type="text" size="small" @click="reback(scope.row)">撤回</el-button>
 <!--              <el-button v-if="hasPermission('cw:workContract:filed') && scope.row.status === '5' && scope.row.createId === $store.state.user.id && (scope.row.filedType === '0' || scope.row.filedType === undefined)" type="text" size="small" @click="filed(scope.row.id)">归档</el-button>-->
               <!--归档暂存修改-->
@@ -210,6 +214,7 @@
               <el-button v-if="scope.row.filedPaperType === '2' && checkIsAuditFiledPaper(scope.row)" type="text"  size="small" @click="examineFiledPaper(scope.row)">审核</el-button>
               <!--              被驳回后当前申请人重新调整-->
               <el-button v-if="hasPermission('cw:workContract:edit')&&scope.row.createId === $store.state.user.id&&scope.row.filedPaperType === '4'" type="text"  size="small" @click="adjustFiledPaper(scope.row)">驳回调整</el-button>
+              </div>
             </template>
           </vxe-column>
         </vxe-table>
@@ -444,7 +449,11 @@
         }).then(() => {
           this.loading = true
           this.contractInfoService.remove(ids).then(({data}) => {
-            this.$message.success(data)
+            if (data === '删除成功') {
+              this.$message.success(data)
+            } else {
+              this.$message.error(data)
+            }
             this.refreshList()
             this.loading = false
           })