Merge remote-tracking branch 'origin/master'

src/views/gh/improvementProposal/ImprovementProposal.data.ts

@@ -65,11 +65,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'improvementMethod'
    },
-   // {
+   {
-   //  title: '最终奖项',
+    title: '最终奖项',
-   //  align:"center",
+    align:"center",
-   //  dataIndex: 'finalAward'
+    dataIndex: 'finalAward_dictText'
-   // },
+   },
    {
     title: '业务展示状态',
     align:"center",

src/views/gh/improvementProposal/ImprovementProposalList.vue

@@ -27,6 +27,12 @@
         <template #label><span title="提案部门">提案部门</span></template>
             <sz-select-dept v-model:value="queryParam.proposalDeptId" :multiple="false" checkStrictly allow-clear />
         </a-form-item>
+        </a-col>
+        <a-col v-if="toggleSearchStatus" :lg="6">
+        <a-form-item name="finalAward">
+        <template #label><span title="最终奖项">最终奖项</span></template>
+            <JDictSelectTag v-model:value="queryParam.finalAward" dictCode="proposal_prize" placeholder="请选择最终奖项" allow-clear />
+        </a-form-item>
         </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">

src/views/gh/improvementProposal/components/ImprovementProposalForm.vue

@@ -2,7 +2,7 @@
   <a-spin :spinning="loading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form v-bind="formItemLayout" name="ImprovementProposalForm" ref="formRef">
+        <a-form v-bind="formItemLayout" name="ImprovementProposalForm" ref="formRef" :class="{ 'detail-disabled': disabled }">
           <a-row>
 						<a-col :span="12">
 							<a-form-item label="提案编号" :required="false" id="ImprovementProposalForm-proposalNo" name="proposalNo">
@@ -50,24 +50,24 @@
 								<a-textarea v-model:value="formData.improvementMethod" :rows="4" placeholder="请输入改善方法及措施" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
+						<a-col :span="24">
-							<a-form-item label="改善前情况描述" v-bind="validateInfos.beforeDesc" id="ImprovementProposalForm-beforeDesc" name="beforeDesc" :labelCol="halfLabelCol" :wrapperCol="halfWrapperCol">
+							<a-form-item label="改善前情况描述" v-bind="validateInfos.beforeDesc" id="ImprovementProposalForm-beforeDesc" name="beforeDesc" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
 								<a-textarea v-model:value="formData.beforeDesc" :rows="4" placeholder="请输入改善前情况描述" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
+						<a-col :span="24">
-							<a-form-item label="改善前图片" :labelCol="halfLabelCol" :wrapperCol="halfWrapperCol">
+							<a-form-item label="改善前图片" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
-								<SUploadFile ref="beforeFileRef" :bussiness-id="formData.id ? `${formData.id}:before` : ''" :multiple="true" :disabled="disabled" />
+								<SUploadFile ref="beforeFileRef" :bussiness-id="formData.proposalNo ? `${formData.proposalNo}:before` : ''" :multiple="true" :disabled="disabled" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
+						<a-col :span="24">
-							<a-form-item label="改善后情况描述" v-bind="validateInfos.afterDesc" id="ImprovementProposalForm-afterDesc" name="afterDesc" :labelCol="halfLabelCol" :wrapperCol="halfWrapperCol">
+							<a-form-item label="改善后情况描述" v-bind="validateInfos.afterDesc" id="ImprovementProposalForm-afterDesc" name="afterDesc" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
 								<a-textarea v-model:value="formData.afterDesc" :rows="4" placeholder="请输入改善后情况描述" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="12">
+						<a-col :span="24">
-							<a-form-item label="改善后图片" :labelCol="halfLabelCol" :wrapperCol="halfWrapperCol">
+							<a-form-item label="改善后图片" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
-								<SUploadFile ref="afterFileRef" :bussiness-id="formData.id ? `${formData.id}:after` : ''" :multiple="true" :disabled="disabled" />
+								<SUploadFile ref="afterFileRef" :bussiness-id="formData.proposalNo ? `${formData.proposalNo}:after` : ''" :multiple="true" :disabled="disabled" />
 							</a-form-item>
 						</a-col>
 						<a-col :span="24">
@@ -75,6 +75,11 @@
 								<a-textarea v-model:value="formData.improvementEffect" :rows="4" placeholder="请输入改善效果" />
 							</a-form-item>
 						</a-col>
+						<a-col v-if="disabled" :span="24">
+							<a-form-item label="部门评定结果" :labelCol="longLabelCol" :wrapperCol="longWrapperCol">
+								<j-dict-select-tag v-model:value="formData.finalAward" dictCode="proposal_prize" placeholder="请等待评定" disabled />
+							</a-form-item>
+						</a-col>
           </a-row>
         </a-form>
       </template>
@@ -204,19 +209,19 @@
       };
       const longLabelCol = {
         xs: {span: 24},
-        sm: {span: 4},
+        sm: {span: 5},
       };
       const longWrapperCol = {
         xs: {span: 24},
-        sm: {span: 20},
+        sm: {span: 16},
       };
       const halfLabelCol = {
         xs: {span: 24},
-        sm: {span: 8},
+        sm: {span: 5},
       };
       const halfWrapperCol = {
         xs: {span: 24},
-        sm: {span: 16},
+        sm: {span: 18},
       };
 
       const disabled = computed(()=>{
@@ -470,4 +475,13 @@
     max-height: 340px;
     overflow: auto;
   }
+  .detail-disabled :deep(.ant-input-clear-icon) {
+    display: none !important;
+  }
+  .detail-disabled :deep(.ant-select-clear) {
+    display: none !important;
+  }
+  .detail-disabled :deep(.ant-input-password-icon) {
+    display: none !important;
+  }
 </style>