财务-报告管理

src/views/modules/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -55,6 +55,7 @@
             <el-col :span="12">
               <el-form-item label="作废原因" prop="cancellateReason"
                             :rules="[
+                              {required: true, message:'作废原因不能为空', trigger:'blur'}
                    ]">
                 <el-input v-model="inputForm.cancellateReason" placeholder="请填写作废原因" clearable></el-input>
               </el-form-item>
@@ -228,6 +229,7 @@
         this.inputForm.projectMasterName = row.projectMasterName // 项目经理
         this.inputForm.reportNo = row.reportNo // 报告文号
         this.inputForm.reportNewLineId = row.reportNewLineId // 新建行id
+        this.inputForm.reportSponsor = row.reportSponsor // 报告主办人
         this.clearClientList()
         this.$forceUpdate()
       },

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

@@ -64,10 +64,10 @@
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="项目经理" prop="projectMasterId"
+                  <el-form-item label="项目经理" prop="projectMasterName"
                                 :rules="[
                    ]">
-                    <el-input :disabled="true" v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>
+                    <el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理" clearable></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -180,7 +180,7 @@
                           <!--                      <el-input :readonly="true" v-model="scope.row.reportDate" placeholder="报告日期" clearable></el-input>-->
                         </template>
                       </vxe-table-column>
-                      <vxe-table-column align="center" field="reportType" title="报告类型" :edit-render="{}">
+                      <vxe-table-column align="center" field="reportType" title="报告类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_report_type')}">
                         <template v-slot:edit="scope">
                           <el-select v-model="scope.row.reportType" placeholder="请选择报告类型" clearable style="width: 100%;">
                             <el-option
@@ -208,7 +208,7 @@
                           <el-input :readonly="true" v-model="scope.row.issueReport" placeholder="是否出具报告" clearable></el-input>
                         </template>
                       </vxe-table-column>
-                      <vxe-table-column align="center" field="opinionType" title="意见类型" :edit-render="{}">
+                      <vxe-table-column align="center" field="opinionType" title="意见类型" :edit-render="{name: '$select', options: $dictUtils.getDictList('cw_opinion_type')}">
                         <template v-slot:edit="scope">
                           <el-select v-model="scope.row.opinionType" placeholder="请选择意见类型" clearable style="width: 100%;">
                             <el-option
@@ -306,7 +306,7 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
-          projectMasterId: '',
+          projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
           projectInfoId: ''
@@ -415,7 +415,7 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
-          projectMasterId: '',
+          projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
           projectInfoId: ''
@@ -569,7 +569,7 @@
           auditYear: '',
           planStartDate: '',
           planEndDate: '',
-          projectMasterId: '',
+          projectMasterName: '',
           projectLeaderId: '',
           procInsId: '',
           processDefinitionId: '',

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

@@ -80,7 +80,7 @@
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理" field="projectMasterName"></vxe-column>
-          <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>
+<!--          <vxe-column min-width="160" align="center" title="报告主办人" field="reportSponsor"></vxe-column>-->
           <vxe-column min-width="160" align="center" title="创建人" field="userName"></vxe-column>
           <vxe-column min-width="160" align="center" title="创建时间" field="createDate"></vxe-column>
           <vxe-column  min-width="150px"align="center" fixed="right" title="状态" field="status" >

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

@@ -52,10 +52,27 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item v-if="inputForm.status !=='2'" label="项目经理" prop="projectMasterId"
+              <el-form-item v-if="inputForm.status !=='2'" label="项目经理" prop="projectMasterName"
                             :rules="[
                    ]">
-                <el-input :disabled="true" v-model="inputForm.projectMasterId" placeholder="请填写项目经理" clearable></el-input>
+                <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="[
+                              {required: true, message: '盖章类型不能为空', trigger: 'blur'}
+                   ]">
+                <!--                <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>
 
@@ -98,23 +115,6 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="盖章类型" prop="signatureType"
-                            :rules="[
-                              {required: true, message: '盖章类型不能为空', trigger: 'blur'}
-                   ]">
-<!--                <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 :span="12">
               <el-form-item label="创建时间" prop="createDate"
                             :rules="[
                    ]">
@@ -302,7 +302,7 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
-          projectMasterId: '',
+          projectMasterName: '',
           cwProjectInfoList: [],
           cwFileInfoList: [],
           servedUnitId: '',
@@ -444,7 +444,7 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
-          projectMasterId: '',
+          projectMasterName: '',
           cwProjectInfoList: []
         }
         this.inputForm.id = id
@@ -486,7 +486,7 @@
         this.inputForm.projectName = row.projectName // 项目名称
         this.inputForm.projectId = row.id // 项目id
         this.inputForm.projectNumber = row.projectNumber // 项目编号
-        this.inputForm.projectMasterId = row.projectMasterName // 项目经理
+        this.inputForm.projectMasterName = row.projectMasterName // 项目经理
         this.clearClientList()
         this.$forceUpdate()
         this.inputForm.cwProjectInfoList = []
@@ -655,7 +655,7 @@
           signatureAnnotator1: '',
           signatureAnnotator2: '',
           signatureType: '',
-          projectMasterId: ''
+          projectMasterName: ''
         }
         // this.$refs.uploadComponent.clearUpload()
         this.$refs.inputForm.resetFields()

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

@@ -17,11 +17,11 @@
             <el-input v-model="inputForm.contractName" :disabled="true" placeholder="请输入合同名称"     clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同状态" prop="contractStatus">
-            <el-input maxlength="64" :disabled="true" v-model="inputForm.contractStatus" placeholder="请输入合同状态"></el-input>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="合同状态" prop="contractStatus">-->
+<!--            <el-input maxlength="64" :disabled="true" v-model="inputForm.contractStatus" placeholder="请输入合同状态"></el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="付款主体" prop="payerSubject"
                         :rules="[{required: true, message: '付款主体不能为空', trigger: 'blur'}

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

@@ -26,11 +26,11 @@
             <el-input v-model="inputForm.contractName"  placeholder="请输入合同名称"     clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同状态" prop="contractStatus">
-            <el-input maxlength="64" :disabled="true" v-model="inputForm.contractStatus" placeholder="请输入合同状态"></el-input>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="合同状态" prop="contractStatus">-->
+<!--            <el-input maxlength="64" :disabled="true" v-model="inputForm.contractStatus" placeholder="请输入合同状态"></el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="付款主体" prop="payerSubject"
                         :rules="[{required: true, message: '付款主体不能为空', trigger: 'blur'}

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

@@ -17,11 +17,11 @@
             <el-input v-model="inputForm.contractName" placeholder="请输入合同名称"     clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="合同状态" prop="contractStatus">
-            <el-input maxlength="64" v-model="inputForm.contractStatus" :disabled="true" placeholder="请输入合同状态"></el-input>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="合同状态" prop="contractStatus">-->
+<!--            <el-input maxlength="64" v-model="inputForm.contractStatus" :disabled="true" placeholder="请输入合同状态"></el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="12">
           <el-form-item label="付款主体" prop="payerSubject"
                         :rules="[{required: true, message: '付款主体不能为空', trigger: 'blur'}