user5 преди 2 години
родител
ревизия
d52a18746f

+ 11 - 10
src/views/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -116,6 +116,13 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+				<el-col :span="12">
+					<el-form-item label="归档时间" prop="auditDate"
+								:rules="[
+					]">
+					  <el-input :disabled="true" v-model="inputForm.auditDate" placeholder="请填写归档时间" clearable></el-input>
+					</el-form-item>
+				</el-col>
                 <el-col v-if="status !== 'audit'" :span="12">
                   <el-form-item label="案卷号" prop="number"
                                 :rules="[
@@ -130,14 +137,14 @@
                     <el-input :disabled="true" v-model="inputForm.isNumber" placeholder="请填写确认案卷号" clearable></el-input>
                   </el-form-item>
                 </el-col>
-                <el-form v-if="status === 'audit'" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+                <el-form v-if="status === 'audit'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
                          label-width="110px" @submit.native.prevent>
                 <el-col  :span="12">
                   <el-form-item label="案卷号" prop="number"
                                 :rules="[
                                 {required: true, message:'案卷号不能为空', trigger:'blur'}
                    ]">
-                    <el-input style="width: 480px" :disabled="false" v-model="inputForm.number" placeholder="请填写案卷号" clearable></el-input>
+                    <el-input style="width: 100%" :disabled="false" v-model="inputForm.number" placeholder="请填写案卷号" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col  :span="12">
@@ -145,17 +152,11 @@
                                 :rules="[
                                 {required: true, message:'确认案卷号不能为空', trigger:'blur'}
                    ]">
-                    <el-input :disabled="false" style="width: 480px" v-model="inputForm.isNumber" placeholder="请填写确认案卷号" clearable></el-input>
+                    <el-input :disabled="false" style="width: 100%" v-model="inputForm.isNumber" placeholder="请填写确认案卷号" clearable></el-input>
                   </el-form-item>
                 </el-col>
                 </el-form>
-                <el-col :span="12">
-                  <el-form-item label="归档时间" prop="auditDate"
-                                :rules="[
-                   ]">
-                    <el-input :disabled="true" v-model="inputForm.auditDate" placeholder="请填写归档时间" clearable></el-input>
-                  </el-form-item>
-                </el-col>
+
                 <el-col :span="24">
                   <el-form-item label="备注" prop="remarks"
                                 :rules="[

+ 6 - 1
src/views/cw/reportManagement/ReportManagementList.vue

@@ -560,7 +560,12 @@
       pushF (row) {
         // console.log('row', row)
         // 读取流程表单
-        let title = ' ' + row.documentNo + ' - ' + row.projectName
+		let title = ' '
+		if (!row.documentNo) {
+			title = ' ' + row.projectName
+		} else {
+			title = ' ' + row.documentNo + ' - ' + row.projectName
+		}
         let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了` + title + '[会计-报告复核]'
         let status = 'startAndClose'
         if (row.reviewStatus === '3') {

+ 9 - 9
src/views/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -472,18 +472,18 @@
               ref="details"
               class="vxe-table-element"
               :data="inputForm.detailFor1010"
-              style="margin-left: 5em"
+              style="margin-left: 5em;width: 100%"
 			  keep-source
               highlight-current-row
               :key="tableKeyClient"
               :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
             >
-              <vxe-table-column field="typeName" width="730px" title="复核的主要内容" :edit-render="{}">
+              <vxe-table-column field="typeName" title="复核的主要内容" :edit-render="{}">
                 <template v-slot:edit="scope">
                   <el-input :disabled="true"  v-model="scope.row.typeName" ></el-input>
                 </template>
               </vxe-table-column>
-              <vxe-table-column width="450px" field="reviewComments" title="复核结果(是/否/不适用)" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
+              <vxe-table-column width="30%" field="reviewComments" title="复核结果(是/否/不适用)" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
                 <template v-slot:edit="scope">
                   <vxe-select :disabled="inputForm.taskName === '二级复核' || inputForm.taskName === '三级复核'" v-model="scope.row.reviewComments" transfer>
                     <vxe-option
@@ -522,18 +522,18 @@
                 ref="details"
                 class="vxe-table-element"
                 :data="inputForm.detailFor1020"
-                style="margin-left: 5em"
+                style="margin-left: 5em;width: 100%"
 				keep-source
                 highlight-current-row
                 :key="tableKeyClient2"
                 :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
               >
-                <vxe-table-column field="typeName" width="730px" title="复核的主要内容" :edit-render="{}">
+                <vxe-table-column field="typeName" title="复核的主要内容" :edit-render="{}">
                   <template v-slot:edit="scope">
                     <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
                   </template>
                 </vxe-table-column>
-                <vxe-table-column width="450px" field="reviewComments" title="复核结果(是/否/不适用)" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
+                <vxe-table-column width="30%" field="reviewComments" title="复核结果(是/否/不适用)" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
                   <template v-slot:edit="scope">
                     <vxe-select :disabled="inputForm.reviewStatus === '4' || inputForm.taskName === '三级复核'" v-model="scope.row.reviewComments" transfer>
                       <vxe-option
@@ -572,18 +572,18 @@
                 ref="details"
                 class="vxe-table-element"
                 :data="inputForm.detailFor1030"
-                style="margin-left: 5em"
+                style="margin-left: 5em;width: 100%"
 				keep-source
                 highlight-current-row
                 :key="tableKeyClient3"
                 :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
               >
-                <vxe-table-column field="typeName" width="730px" title="复核的主要内容" :edit-render="{}">
+                <vxe-table-column field="typeName" title="复核的主要内容" :edit-render="{}">
                   <template v-slot:edit="scope">
                     <el-input :disabled="true" v-model="scope.row.typeName" ></el-input>
                   </template>
                 </vxe-table-column>
-                <vxe-table-column width="450px" field="reviewComments" title="复核结果(是/否/不适用)" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
+                <vxe-table-column width="30%" field="reviewComments" title="复核结果(是/否/不适用)" :edit-render="{name: '$select', options: $dictUtils.getDictList('yes_no_notApplicable')}">
                   <template v-slot:edit="scope">
                     <vxe-select :disabled="inputForm.taskName === '一级复核' || inputForm.reviewStatus === '4'" v-model="scope.row.reviewComments" transfer>
                       <vxe-option