lizhenhao преди 2 години
родител
ревизия
74f6b90ba3
променени са 2 файла, в които са добавени 41 реда и са изтрити 32 реда
  1. 36 29
      src/views/modules/cw/workClientInfo/WorkClientForm.vue
  2. 5 3
      src/views/modules/cw/workClientInfo/WorkClientList.vue

+ 36 - 29
src/views/modules/cw/workClientInfo/WorkClientForm.vue

@@ -13,7 +13,7 @@
       <el-col :span="24">
         <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
           <el-tab-pane label="基本信息" name="base">
-            <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+            <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
                      label-width="135px" @submit.native.prevent>
               <el-row  :gutter="0">
                 <el-col :span="10">
@@ -274,7 +274,7 @@
             </el-form>
           </el-tab-pane>
           <el-tab-pane label="客户分类" name="type">
-            <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+            <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
                      label-width="135px" @submit.native.prevent>
               <el-row  :gutter="15">
                 <el-col :span="12">
@@ -290,7 +290,7 @@
                   <el-form-item label="上市类型" prop="cwWorkClientTypeDTO.listedType"
                                 :rules="[
                    ]">
-                    <el-select :disabled="disabled_up || formReadOnly" v-model="inputForm.cwWorkClientTypeDTO.listedType" placeholder="请选择上市类型" clearable style="width: 100%;">
+                    <el-select :disabled="disabled_up || method==='view'" v-model="inputForm.cwWorkClientTypeDTO.listedType" placeholder="请选择上市类型" clearable style="width: 100%;">
                       <el-option
                         v-for="item in $dictUtils.getDictList('cw_work_client_listed_type')"
                         :key="item.value"
@@ -305,7 +305,7 @@
                                 :rules="[
                    ]">
                     <el-input-number
-                      :disabled="disabled_up || formReadOnly"
+                      :disabled="disabled_up || method==='view'"
                       v-model="inputForm.cwWorkClientTypeDTO.holdingCompNum"
                       controls-position="right"
                       style="width:100%"
@@ -323,7 +323,7 @@
                                 :rules="[
                    ]">
                     <el-input-number
-                      :disabled="disabled_up || formReadOnly"
+                      :disabled="disabled_up || method==='view'"
                       v-model="inputForm.cwWorkClientTypeDTO.holdingListedCompNum"
                       controls-position="right"
                       style="width:100%"
@@ -340,14 +340,14 @@
                   <el-form-item label="股票代码" prop="cwWorkClientTypeDTO.stockSymbol"
                                 :rules="[
                    ]">
-                    <el-input :disabled="disabled_up || formReadOnly" v-model="inputForm.cwWorkClientTypeDTO.stockSymbol" placeholder="请填写股票代码" clearable></el-input>
+                    <el-input :disabled="disabled_up || method==='view'" v-model="inputForm.cwWorkClientTypeDTO.stockSymbol" placeholder="请填写股票代码" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="股票简称" prop="cwWorkClientTypeDTO.stockAbbreviation"
                                 :rules="[
                    ]">
-                    <el-input :disabled="disabled_up || formReadOnly" v-model="inputForm.cwWorkClientTypeDTO.stockAbbreviation" placeholder="请填写股票简称" clearable></el-input>
+                    <el-input :disabled="disabled_up || method==='view'" v-model="inputForm.cwWorkClientTypeDTO.stockAbbreviation" placeholder="请填写股票简称" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -355,7 +355,7 @@
                                 :rules="[
                    ]">
                     <el-date-picker
-                      :disabled="disabled_up || formReadOnly"
+                      :disabled="disabled_up || method==='view'"
                       v-model="inputForm.cwWorkClientTypeDTO.releaseDate"
                       type="date"
                       value-format="yyyy-MM-dd"
@@ -371,7 +371,7 @@
                                 :rules="[
                    ]">
                     <el-date-picker
-                      :disabled="disabled_up || formReadOnly"
+                      :disabled="disabled_up || method==='view'"
                       v-model="inputForm.cwWorkClientTypeDTO.listedDate"
                       type="date"
                       value-format="yyyy-MM-dd"
@@ -386,7 +386,7 @@
                   <el-form-item label="证券市场" prop="cwWorkClientTypeDTO.securitiesMarket"
                                 :rules="[
                    ]">
-                    <el-select :disabled="disabled_up || formReadOnly" v-model="inputForm.cwWorkClientTypeDTO.securitiesMarket" placeholder="请选择证券市场" clearable style="width: 100%;">
+                    <el-select :disabled="disabled_up || method==='view'" v-model="inputForm.cwWorkClientTypeDTO.securitiesMarket" placeholder="请选择证券市场" clearable style="width: 100%;">
                       <el-option
                         v-for="item in $dictUtils.getDictList('cw_work_client_securities_market')"
                         :key="item.value"
@@ -407,14 +407,14 @@
                   <el-form-item label="首次发行签字注师1" prop="cwWorkClientTypeDTO.signatory1"
                                 :rules="[
                    ]">
-                    <UserSelect size="medium" ref="userSelect1" :disabled="formReadOnly" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect1" :disabled="method==='view'" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="首次发行签字注师2" prop="cwWorkClientTypeDTO.signatory2"
                                 :rules="[
                    ]">
-                    <UserSelect size="medium" ref="userSelect2" :disabled="formReadOnly" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect2" :disabled="method==='view'" :readonly="true" :limit='10' :value="inputForm.cwWorkClientTypeDTO.signatory2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -445,14 +445,14 @@
                   <el-form-item label="前任事务所" prop="cwWorkClientTypeDTO.formerFirm"
                                 :rules="[
                    ]">
-                    <el-input :disabled="disabled_change || formReadOnly" v-model="inputForm.cwWorkClientTypeDTO.formerFirm" placeholder="请填写前任事务所" clearable></el-input>
+                    <el-input :disabled="disabled_change || method==='view'" v-model="inputForm.cwWorkClientTypeDTO.formerFirm" placeholder="请填写前任事务所" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="事务所变更原因" prop="cwWorkClientTypeDTO.firmChangeCause"
                                 :rules="[
                    ]">
-                    <el-input :disabled="disabled_change || formReadOnly" v-model="inputForm.cwWorkClientTypeDTO.firmChangeCause" placeholder="请填写事务所变更原因" clearable></el-input>
+                    <el-input :disabled="disabled_change || method==='view'" v-model="inputForm.cwWorkClientTypeDTO.firmChangeCause" placeholder="请填写事务所变更原因" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -497,12 +497,12 @@
           </el-tab-pane>
           <el-tab-pane label="开票信息" name="billing">
             <el-row :gutter="15">
-              <el-button type="info" style="margin-bottom: 15px" size="mini" :disabled="formReadOnly" @click="insertEvent('billing')">
+              <el-button type="info" style="margin-bottom: 15px" size="mini" :disabled="method==='view'" @click="insertEvent('billing')">
                 新增开票信息
               </el-button>
             </el-row>
             <el-row  :gutter="15">
-              <el-form :disabled="formReadOnly">
+              <el-form :disabled="method==='view'">
                 <vxe-table
                   border
                   show-overflow
@@ -520,7 +520,7 @@
                 >
                   <vxe-table-column align="center" field="isTaxpayerIdentificationNo" title="是否有纳税人识别号" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no')}">
                     <template v-slot:edit="scope">
-                      <vxe-select :disabled="formReadOnly" @change="changeTaxpayerIdentificationNo(scope.$rowIndex)" v-model="scope.row.isTaxpayerIdentificationNo" placeholder="是否有纳税人识别号" clearable style="width: 100%;" transfer>
+                      <vxe-select :disabled="method==='view'" @change="changeTaxpayerIdentificationNo(scope.$rowIndex)" v-model="scope.row.isTaxpayerIdentificationNo" placeholder="是否有纳税人识别号" clearable style="width: 100%;" transfer>
                         <vxe-option
                           v-for="item in $dictUtils.getDictList('yes_no')"
                           :key="item.value"
@@ -566,12 +566,12 @@
           </el-tab-pane>
           <el-tab-pane label="客户联系人" name="contact">
             <el-row :gutter="15">
-              <el-button type="info" style="margin-bottom: 15px" size="mini" :disabled="formReadOnly" @click="insertEvent('contact')">
+              <el-button type="info" style="margin-bottom: 15px" size="mini" :disabled="method==='view'" @click="insertEvent('contact')">
                 新增客户联系人
               </el-button>
             </el-row>
             <el-row  :gutter="15">
-              <el-form :disabled="formReadOnly">
+              <el-form :disabled="method==='view'">
                 <vxe-table
                   border
                   :column-config="{resizable: true}"
@@ -594,7 +594,7 @@
                   </vxe-table-column>
                   <vxe-table-column align="center" field="sex" title="性别" :edit-render="{name: '$select', options: $dictUtils.getDictList('sex')}">
                     <template v-slot:edit="scope">
-                      <vxe-select :disabled="formReadOnly" v-model="scope.row.sex" placeholder="性别" clearable style="width: 100%;" transfer>
+                      <vxe-select :disabled="method==='view'" v-model="scope.row.sex" placeholder="性别" clearable style="width: 100%;" transfer>
                         <vxe-option
                           v-for="item in $dictUtils.getDictList('sex')"
                           :key="item.value"
@@ -658,6 +658,7 @@
     </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'" type="primary" icon="el-icon-circle-check" @click="doSubmit('save')">确定</el-button>
     </span>
 
     <WorkClientListForm ref="workClientListForm" @getWorkClient="getWorkClient"></WorkClientListForm>
@@ -816,11 +817,16 @@
       },
       init (method, id) {
         this.visible = true
-        this.title = '客户信息详情'
-        this.formReadOnly = true
+        // this.formReadOnly = true
         this.activeName = 'base'
         this.workClientService = new WorkClientService()
-        this.method = method
+        if (method === 'edit') {
+          this.method = method
+          this.title = '客户信息修改'
+        } else {
+          this.method = 'view'
+          this.title = '客户信息详情'
+        }
         this.inputForm = {
           id: '',
           createDate: '',
@@ -916,9 +922,9 @@
             if (this.commonJS.isEmpty(this.inputForm.companyLevel)) {
               this.inputForm.companyLevel = '1'
             }
-            if (this.formReadOnly) {
-              this.method = 'view'
-            }
+            // if (this.formReadOnly) {
+            //   this.method = 'view'
+            // }
             this.$refs.uploadComponent.newUpload(this.method, this.inputForm.workAttachmentDtoList, 'cw_work_client', null, null, null, null, false)
             if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList)) {
               this.inputForm.cwWorkClientContactDTOList = []
@@ -961,17 +967,18 @@
       doSubmit (status, callback) {
         if (status === 'save') {
           // 暂存
-          this.inputForm.status = '1'
+          // this.inputForm.status = '1'
           this.loading = true
           if (this.$refs.uploadComponent.checkProgress()) {
             this.loading = false
             return
           }
           this.inputForm.workAttachmentDtoList = this.$refs.uploadComponent.getDataList()
-          this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+          // this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
           this.workClientService.saveForm(this.inputForm).then(({data}) => {
-            callback(data.businessTable, data.businessId, this.inputForm)
+            // callback(data.businessTable, data.businessId, this.inputForm)
             this.loading = false
+            this.close()
           }).catch(() => {
             this.loading = false
           })

+ 5 - 3
src/views/modules/cw/workClientInfo/WorkClientList.vue

@@ -148,9 +148,11 @@
           </vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&(scope.row.createBy.id === $store.state.user.id || isAdmin)&&scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'" type="text" icon="el-icon-edit" size="small" @click="push(scope.row)">修改</el-button>
-              <el-button v-if="hasPermission('cw_work_client:info:edit')&&(scope.row.createBy.id === $store.state.user.id || isAdmin)&&scope.row.status==='2'" type="text" icon="el-icon-edit" size="small" @click="reback(scope.row)">撤回</el-button>
-              <el-button v-if="hasPermission('cw_work_client:info:del')&&(scope.row.createBy.id === $store.state.user.id || isAdmin)&&scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'" type="text" icon="el-icon-edit" size="small" @click="push(scope.row)">修改</el-button>
+              <el-button v-else-if="hasPermission('cw_work_client:info:edit')&&isAdmin&&scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('cw_work_client:info:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='2'" type="text" icon="el-icon-edit" size="small" @click="reback(scope.row)">撤回</el-button>
+              <el-button v-if="hasPermission('cw_work_client:info:del')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-else-if="hasPermission('cw_work_client:info:del')&&isAdmin&&scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5'" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
           </vxe-column>
         </vxe-table>