Merge remote-tracking branch 'origin/master'

src/views/modules/cw/projectRecords/ProjectRecordsForm.vue

@@ -15,7 +15,7 @@
         <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-divider v-if="commonJS.isNotEmpty(inputForm.contractId) && method === 'view'" content-position="left">
-            <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewContract(inputForm.contractId)">查看合同详情</el-link>
+            <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewContract(inputForm.contractId)"><b>查看合同详情</b></el-link>
           </el-divider>
           <el-divider v-else content-position="left"><i class="el-icon-document"></i> 选择合同</el-divider>
           <el-row  :gutter="15">

src/views/modules/cw/projectRecords/ProjectRecordsTaskForm.vue

@@ -6,7 +6,7 @@
         <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
                      label-width="135px" @submit.native.prevent>
           <el-divider v-if="commonJS.isNotEmpty(inputForm.contractId) && formReadOnly" content-position="left">
-            <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewContract(inputForm.contractId)">查看合同详情</el-link>
+            <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewContract(inputForm.contractId)"><b>查看合同详情</b></el-link>
           </el-divider>
           <el-divider v-else content-position="left"><i class="el-icon-document"></i> 选择合同</el-divider>
           <el-row  :gutter="15">

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

@@ -4,7 +4,7 @@
       :title="title"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1200px"
+      width="1400px"
       height="500px"
       @close="close"
       @keyup.enter.native=""
@@ -70,13 +70,27 @@
                     <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
                   </el-form-item>
                 </el-col>
-
+                <el-col :span="12">
+                  <el-form-item label="盖章类型" prop="signatureType"
+                                :rules="[
+                   ]">
+                    <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
+                    <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">
+                      <el-option
+                        v-for="item in $dictUtils.getDictList('cw_signature_type')"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col v-if="inputForm.signatureType === '1' || commonJS.isEmpty(inputForm.signatureType)" :span="12">
                   <el-form-item label="签字注师1" prop="signatureAnnotator1"
                                 :rules="[
                    ]">
                     <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                    <UserSelect size="medium" ref="userSelect1" :disabled="formReadOnly" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
 
@@ -85,7 +99,7 @@
                                 :rules="[
                    ]">
                     <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                    <UserSelect size="medium" ref="userSelect2" :disabled="formReadOnly" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
 
@@ -95,7 +109,7 @@
                               {required: true, message:'签字注师1不能为空', trigger:'blur'}
                    ]">
                     <!--                <el-input v-model="inputForm.signatureAnnotator1" placeholder="请填写签字注师1" clearable></el-input>-->
-                    <UserSelect size="medium" ref="userSelect1" :disabled="formReadOnly" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect1" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator1" @getValue='(value) => {changeSignatory1(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
 
@@ -105,23 +119,14 @@
                               {required: true, message:'签字注师2不能为空', trigger:'blur'}
                    ]">
                     <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                    <UserSelect size="medium" ref="userSelect2" :disabled="formReadOnly" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                    <UserSelect size="medium" ref="userSelect2" :disabled="method === 'view'" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
                   </el-form-item>
                 </el-col>
-
                 <el-col :span="12">
-                  <el-form-item label="盖章类型" prop="signatureType"
+                  <el-form-item label="报告实际制作人" prop="realCreate"
                                 :rules="[
                    ]">
-                    <!--                <el-input v-model="inputForm.signatureType" placeholder="请填写盖章类型" clearable></el-input>-->
-                    <el-select v-model="inputForm.signatureType" placeholder="请选择盖章类型" clearable style="width: 100%;">
-                      <el-option
-                        v-for="item in $dictUtils.getDictList('cw_signature_type')"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
+                    <UserSelect size="medium" :readonly="true" :disabled="method === 'view'" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
                   </el-form-item>
                 </el-col>
 
@@ -144,7 +149,7 @@
                 </el-button>
                 <!--            <el-button v-if="hasPermission('cw:reportManagement:del')" type="text" size="small" @click="del()">删除</el-button>-->
                 <el-row  :gutter="15">
-                  <el-form :disabled="formReadOnly">
+                  <el-form :disabled="method === 'view'">
                     <vxe-table
                       border
                       show-overflow
@@ -382,7 +387,8 @@
           cwProjectInfoList: [],
           cwWorkClientContactDTOList: [],
           cwFileInfoList: [],
-          projectInfoId: ''
+          projectInfoId: '',
+          realCreate: ''
         },
         keyWatch: '',
         activeName: 'newRow',
@@ -503,7 +509,8 @@
           cwProjectInfoList: [],
           cwWorkClientContactDTOList: [],
           cwFileInfoList: [],
-          projectInfoId: ''
+          projectInfoId: '',
+          realCreate: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -666,7 +673,8 @@
           contractNum: '',
           payerSubject: '',
           paymentMethod: '',
-          contractId: ''
+          contractId: '',
+          realCreate: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

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

@@ -52,7 +52,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item v-if="inputForm.status !=='2'" label="项目经理" prop="projectMasterName"
+              <el-form-item label="项目经理" prop="projectMasterName"
                             :rules="[
                    ]">
                 <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
@@ -113,7 +113,13 @@
                 <UserSelect size="medium" ref="userSelect2" :disabled="true" :readonly="true" :limit='10' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
               </el-form-item>
             </el-col>
-
+            <el-col :span="12">
+              <el-form-item label="报告实际制作人" prop="realCreate"
+                            :rules="[
+                   ]">
+                <UserSelect size="medium" :readonly="true" :disabled="true" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="创建时间" prop="createDate"
                             :rules="[
@@ -309,7 +315,8 @@
           servedUnitId: '',
           status: '',
           status1: '',
-          status2: ''
+          status2: '',
+          realCreate: ''
         },
         keyWatch: '',
         activeName: 'newRow',
@@ -450,7 +457,8 @@
           cwProjectInfoList: [],
           status: '',
           status1: '',
-          status2: ''
+          status2: '',
+          realCreate: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -703,7 +711,8 @@
           projectMasterName: '',
           status: '',
           status1: '',
-          status2: ''
+          status2: '',
+          realCreate: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

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

@@ -47,18 +47,18 @@
 
                   :url="`/sys/office/treeData?type=2`"
                   :value="inputForm.officeId"
+                  size="medium"
                   :accordion="true"
                   @getValue="(value) => {inputForm.officeId=value}"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item v-if="inputForm.status !=='2'" label="项目经理" prop="projectMasterName"
+              <el-form-item label="项目经理" prop="projectMasterName"
                             :rules="[
                    ]">
                 <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
               </el-form-item>
             </el-col>
-
             <el-col :span="12">
               <el-form-item label="盖章类型" prop="signatureType"
                             :rules="[
@@ -113,7 +113,13 @@
                 <UserSelect size="medium" ref="userSelect2" :disabled="formReadOnly" :readonly="true" :limit='1' :value="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
               </el-form-item>
             </el-col>
-
+            <el-col :span="12">
+              <el-form-item label="报告实际制作人" prop="realCreate"
+                            :rules="[
+                   ]">
+                <UserSelect size="medium" :readonly="true" :disabled="formReadOnly" :limit='1' :value="inputForm.realCreate" @getValue='(value) => {inputForm.realCreate = value}'></UserSelect>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="创建时间" prop="createDate"
                             :rules="[
@@ -306,7 +312,8 @@
           cwProjectInfoList: [],
           cwFileInfoList: [],
           servedUnitId: '',
-          status: ''
+          status: '',
+          realCreate: ''
         },
         keyWatch: '',
         activeName: 'newRow',
@@ -445,7 +452,8 @@
           signatureAnnotator2: '',
           signatureType: '',
           projectMasterName: '',
-          cwProjectInfoList: []
+          cwProjectInfoList: [],
+          realCreate: ''
         }
         this.inputForm.id = id
         this.loading = false
@@ -461,6 +469,12 @@
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
             }
+            if (this.commonJS.isEmpty(this.inputForm.officeId)) {
+              this.inputForm.officeId = JSON.parse(localStorage.getItem('user')).officeDTO.id
+            }
+            if (this.commonJS.isEmpty(this.inputForm.realCreate)) {
+              this.inputForm.realCreate = JSON.parse(localStorage.getItem('user')).id
+            }
             this.loading = false
           })
           // this.projectRecordsService.queryById(this.inputForm.id).then(({data}) => {
@@ -660,7 +674,8 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
-          projectMasterName: ''
+          projectMasterName: '',
+          realCreate: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

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

@@ -7,6 +7,7 @@
       width="1400px"
       height="500px"
       @close="close"
+      append-to-body
       @keyup.enter.native=""
       :visible.sync="visible">
     <el-row>

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

@@ -3,7 +3,10 @@
     <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
              label-width="150px">
 
-      <el-divider content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
+      <el-divider v-if="formReadOnly && commonJS.isNotEmpty(inputForm.customerId)" content-position="left">
+        <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewClient(inputForm.customerId)"><b>查看客户详情</b></el-link>
+      </el-divider>
+      <el-divider v-else content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
       <el-row  :gutter="0">
         <el-col :span="12">
           <el-form-item label="委托方联系人" prop="clientContacts"
@@ -295,6 +298,7 @@
         zIndex="9999"/>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
     <WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2"></WorkClientChooseRadio>
+    <WorkClientForm ref="workClientForm" @refreshList=""></WorkClientForm>
   </div>
 </template>
 
@@ -305,6 +309,7 @@
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
+  import WorkClientForm from '../workClientInfo/WorkClientForm'
   import OSSSerive, {
     httpRequest,
     toHref,
@@ -425,7 +430,8 @@
       UpLoadComponent,
       WorkClientChooseForm,
       SelectTree,
-      WorkClientChooseRadio
+      WorkClientChooseRadio,
+      WorkClientForm
     },
     ossService: null,
     // workContractService: null,
@@ -1022,6 +1028,10 @@
           this.$message.warning(`合同终止日期要大于合同开始日期`)
           this.inputForm.closingDate = ''
         }
+      },
+      // 查看客户信息详情
+      viewClient (id) {
+        this.$refs.workClientForm.init('view', id)
       }
     }
   }

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

@@ -3,7 +3,10 @@
     <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
              label-width="150px">
 
-      <el-divider content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
+      <el-divider v-if="formReadOnly && commonJS.isNotEmpty(inputForm.customerId)" content-position="left">
+        <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewClient(inputForm.customerId)"><b>查看客户详情</b></el-link>
+      </el-divider>
+      <el-divider v-else content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
       <el-row  :gutter="0">
         <el-col :span="12">
           <el-form-item label="委托方联系人" prop="clientContacts"
@@ -310,6 +313,7 @@
         zIndex="9999"/>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
     <WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2"></WorkClientChooseRadio>
+    <WorkClientForm ref="workClientForm" @refreshList=""></WorkClientForm>
   </div>
 </template>
 
@@ -321,6 +325,7 @@
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
+  import WorkClientForm from '../workClientInfo/WorkClientForm'
   import OSSSerive, {
     httpRequest,
     toHref,
@@ -441,7 +446,8 @@
       UpLoadComponent,
       WorkClientChooseForm,
       SelectTree,
-      WorkClientChooseRadio
+      WorkClientChooseRadio,
+      WorkClientForm
     },
     ossService: null,
     // workContractService: null,
@@ -958,6 +964,10 @@
           this.$message.warning(`合同终止日期要大于合同开始日期`)
           this.inputForm.closingDate = ''
         }
+      },
+      // 查看客户信息详情
+      viewClient (id) {
+        this.$refs.workClientForm.init('view', id)
       }
     }
   }

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

@@ -12,7 +12,10 @@
       :visible.sync="visible">
     <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
              label-width="150px">
-      <el-divider content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
+      <el-divider v-if="method==='view' && commonJS.isNotEmpty(inputForm.customerId)" content-position="left">
+        <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewClient(inputForm.customerId)"><b>查看客户详情</b></el-link>
+      </el-divider>
+      <el-divider v-else content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
       <el-row  :gutter="0">
         <el-col :span="12">
           <el-form-item label="委托方联系人" prop="clientContacts"
@@ -308,6 +311,7 @@
       zIndex="9999"/>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
       <WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2"></WorkClientChooseRadio>
+      <WorkClientForm ref="workClientForm" @refreshList=""></WorkClientForm>
     </el-dialog>
   </div>
 </template>
@@ -319,6 +323,7 @@
   import WorkClientChooseForm from '../workClientInfo/WorkClientChooseForm'
   import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import WorkClientForm from '../workClientInfo/WorkClientForm'
   import OSSSerive, {
     httpRequest,
     toHref,
@@ -443,7 +448,8 @@
       UpLoadComponent,
       WorkClientChooseForm,
       SelectTree,
-      WorkClientChooseRadio
+      WorkClientChooseRadio,
+      WorkClientForm
     },
     ossService: null,
     // workContractService: null,
@@ -879,6 +885,10 @@
         } else {
           this.inputForm.contractFee = ''
         }
+      },
+      // 查看客户信息详情
+      viewClient (id) {
+        this.$refs.workClientForm.init('view', id)
       }
     }
   }

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

@@ -3,7 +3,10 @@
     <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
              label-width="150px">
 
-      <el-divider content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
+      <el-divider v-if="formReadOnly && commonJS.isNotEmpty(inputForm.customerId)" content-position="left">
+        <el-link  type="primary" :underline="false" icon="el-icon-document" @click="viewClient(inputForm.customerId)"><b>查看客户详情</b></el-link>
+      </el-divider>
+      <el-divider v-else content-position="left"><i class="el-icon-document"></i> 客户信息</el-divider>
       <el-row  :gutter="0">
         <el-col :span="12">
           <el-form-item label="委托方联系人" prop="clientContacts"
@@ -284,6 +287,7 @@
         zIndex="9999"/>
     <WorkClientChooseForm ref="workClientChooseForm" @getWorkClientChoose="getWorkClientChoose"></WorkClientChooseForm>
     <WorkClientChooseRadio ref="workClientChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2"></WorkClientChooseRadio>
+    <WorkClientForm ref="workClientForm" @refreshList=""></WorkClientForm>
   </div>
 </template>
 
@@ -902,6 +906,10 @@
           this.$message.warning(`合同终止日期要大于合同开始日期`)
           this.inputForm.closingDate = ''
         }
+      },
+      // 查看客户信息详情
+      viewClient (id) {
+        this.$refs.workClientForm.init('view', id)
       }
     }
   }