#3998

src/services/proto/hedgedItem/interface.ts

@@ -3,7 +3,7 @@
  */
 export interface HedgedItemAddReq {
     HedgedItemNum: string; // 被套期项目编号
-    HedgedItemName: string; // 项目名称
+    HedgedItemName?: string; // 项目名称
     HedgedType?: number; // 套期类型-1:采购计划项目
     PlanStartDate: string; // 计划开始日期
     PlanEndDate: string; // 计划结束日期

src/views/hedgeditem/trade/components/add/form.ts

@@ -14,7 +14,6 @@ export function useForm() {
 
     const formData = reactive<HedgedItemAddReq>({
         HedgedItemNum: '', // 被套期项目编号
-        HedgedItemName: '', // 项目名称
         HedgedType: undefined, // 套期类型-1:采购计划项目
         PlanStartDate: '', // 计划开始日期
         PlanEndDate: '', // 计划结束日期
@@ -29,7 +28,7 @@ export function useForm() {
 
     const rules = {
         HedgedItemNum: [{ required: true, trigger: 'blur', message: '请输入项目编号' }],
-        HedgedItemName: [{ required: true, trigger: 'blur', message: '请输入项目名称' }],
+        //HedgedItemName: [{ required: true, trigger: 'blur', message: '请输入项目名称' }],
         //PlanStartDate: [{ required: true, message: '请选择开始时间' }],
         //PlanEndDate: [{ required: true, message: '请选择结束时间' }],
         HedgedType: [{ required: true, type: 'number', message: '请选择套期类型' }],

src/views/hedgeditem/trade/components/add/index.vue

@@ -10,7 +10,7 @@
                             v-model:value="formData.HedgedItemNum" />
                     </a-form-item>
                 </a-col>
-                <a-col :span="12">
+                <a-col :span="12" v-if="false">
                     <a-form-item label="项目名称" name="HedgedItemName">
                         <a-input class="dialogInput" style="width: 200px" placeholder="请输入项目名称"
                             v-model:value="formData.HedgedItemName" />

src/views/hedgeditem/trade/components/ending/index.vue

@@ -17,16 +17,6 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="计划开始">
-                            <span class="white">{{ formatValue(selectedRow.planstartdate) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="计划结束">
-                            <span class="white">{{ formatValue(selectedRow.planenddate) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
                         <a-form-item label="套期类型">
                             <span class="white">{{ getHedgedTypeName(selectedRow.hedgedtype) }}</span>
                         </a-form-item>
@@ -37,8 +27,13 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="现货市价" v-if="false">
-                            <span class="white">0</span>
+                        <a-form-item label="计划开始">
+                            <span class="white">{{ formatValue(selectedRow.planstartdate) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="计划结束">
+                            <span class="white">{{ formatValue(selectedRow.planenddate) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>