commit 计划的一系列问题

src/services/go/ermcp/plan/interface.ts

@@ -1,6 +1,10 @@
 export interface Ermcp3HedgePlan{
     accountid	:number;//资金账号
     areauserid	:number;//用户ID
+    auditid	:number;//审核id
+    auditname	:string;//审核人名称
+    auditremark	:string;//审核备注
+    auditsrc	:number;//审核来源 1-管理端 2-终端
     audittime	:string;//审核时间
     contracttype	:number;//计划类型 - 1:采购 -1:销售
     convertfactor	:number;//标仓系数

src/views/business/plan/components/audit/index.vue

@@ -22,68 +22,71 @@
     <a-form class="inlineForm"
             :form="form"
             @submit="handleSearch">
-      <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="计划类型">
-              <span class="white">{{ getPlanContractType(selectedRow.contracttype) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="计划名称">
-              <span class="white">{{ formatValue(selectedRow.hedgeplanno) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="现货品种">
-              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="标仓系数">
-              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="计划量">
-              <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="备注">
-              <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-      </fieldset>
-      <fieldset class="formFieldSet">
-        <legend>其它信息</legend>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="交易用户">
-              <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="结算币种">
-                <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="备注">
-              <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </fieldset>
+        <fieldset class="formFieldSet">
+            <legend>套保计划</legend>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="计划类型">
+                        <span class="white">{{ getPlanContractType(selectedRow.contracttype) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="计划名称">
+                        <span class="white">{{ formatValue(selectedRow.hedgeplanno) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="现货品种">
+                        <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="商品">
+                        <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="计划量">
+                        <span class="white">{{ formatValue(selectedRow.planqty) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="标仓系数">
+                        <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="交易用户">
+                        <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="结算币种">
+                        <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="状态">
+                        <span class="white">{{ formatValue(getPlanStatusName(selectedRow.hedgeplanstatus)) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="备注">
+                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </fieldset>
     </a-form>
   </a-modal>
 </template>
@@ -95,7 +98,7 @@ import { Modal } from 'ant-design-vue';
 import { ErmcpHedgePlanReq } from '@/services/proto/hedgeplan/interface';
 import Long from 'long';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
-import { getPlanContractType } from '@/views/business/plan/setup';
+import {getPlanContractType, getPlanStatusName} from '@/views/business/plan/setup';
 import { formatValue } from '@/common/methods';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
@@ -165,6 +168,7 @@ export default defineComponent({
             getPlanContractType,
             formatValue,
             getPayCurrencyTypeEnumList,
+            getPlanStatusName,
         };
     },
 });

src/views/business/plan/components/delete/index.vue

@@ -7,16 +7,20 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-      <a-button key="submit"
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="submit">删除</a-button>
+      <a-button key="cancel"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="cancel">取消</a-button>
     </template>
     <a-form class="inlineForm"
             :form="form"
             @submit="handleSearch">
       <fieldset class="formFieldSet">
-        <legend>基本信息</legend>
+        <legend>套保计划</legend>
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="计划类型">
@@ -36,8 +40,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="标仓系数">
-              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
+            <a-form-item label="商品">
+              <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -48,30 +52,56 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="备注">
-              <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+            <a-form-item label="标仓系数">
+              <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="交易用户">
+                      <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="结算币种">
+                      <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="状态">
+                      <span class="white">{{ formatValue(getPlanStatusName(selectedRow.hedgeplanstatus)) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="备注">
+                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
       </fieldset>
       <fieldset class="formFieldSet">
-        <legend>其它信息</legend>
+        <legend>审核信息</legend>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="交易用户">
-              <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
+            <a-form-item label="审核时间">
+              <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="结算币种">
-                <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
+            <a-form-item label="审核人">
+                <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="备注">
-              <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+            <a-form-item label="审核意见">
+              <span class="white">{{ formatValue(selectedRow.auditremark) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -85,7 +115,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { Ermcp3HedgePlan } from '@/services/go/ermcp/plan/interface';
 import { formatValue } from '@/common/methods';
-import { getPlanContractType } from '@/views/business/plan/setup';
+import {getPlanContractType, getPlanStatusName} from '@/views/business/plan/setup';
 import { Modal } from 'ant-design-vue';
 import { ErmcpHedgePlanReq } from '@/services/proto/hedgeplan/interface';
 import * as Long from 'long';
@@ -130,6 +160,7 @@ export default defineComponent({
             formatValue,
             getPlanContractType,
             getPayCurrencyTypeEnumList,
+            getPlanStatusName,
         };
     },
 });

src/views/business/plan/components/detail/index.vue

@@ -16,8 +16,8 @@
         <a-form class="inlineForm"
                     :form="form"
                     @submit="handleSearch">
-        <fieldset class="formFieldSet">
-            <legend>基本信息</legend>
+            <fieldset class="formFieldSet">
+                <legend>套保计划</legend>
                 <a-row :gutter="24">
                     <a-col :span="12">
                         <a-form-item label="计划类型">
@@ -37,8 +37,8 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="标仓系数">
-                            <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
+                        <a-form-item label="商品">
+                            <span class="white">{{ formatValue(selectedRow.wrstandardname) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>
@@ -49,34 +49,60 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
+                        <a-form-item label="标仓系数">
+                            <span class="white">{{ formatValue(selectedRow.convertfactor) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="交易用户">
+                            <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="结算币种">
+                            <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="状态">
+                            <span class="white">{{ formatValue(getPlanStatusName(selectedRow.hedgeplanstatus)) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
                         <a-form-item label="备注">
                             <span class="white">{{ formatValue(selectedRow.remark) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>
-        </fieldset>
-        <fieldset class="formFieldSet">
-            <legend>其它信息</legend>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="交易用户">
-                        <span class="white">{{ formatValue(selectedRow.tradeusername) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="结算币种">
-                        <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="备注">
-                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </fieldset>
+            </fieldset>
+            <fieldset class="formFieldSet">
+                <legend>审核信息</legend>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="审核时间">
+                            <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="审核人">
+                            <span class="white">{{ formatValue(selectedRow.auditname) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+                <a-row :gutter="24">
+                    <a-col :span="12">
+                        <a-form-item label="审核意见">
+                            <span class="white">{{ formatValue(selectedRow.auditremark) }}</span>
+                        </a-form-item>
+                    </a-col>
+                </a-row>
+            </fieldset>
          </a-form>
     </a-modal>
 </template>
@@ -86,7 +112,7 @@ import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
 import {closeModal} from '@/common/setup/modal/index';
 import {Ermcp3HedgePlan} from '@/services/go/ermcp/plan/interface';
 import {formatValue} from '@/common/methods';
-import {getPlanContractType} from '@/views/business/plan/setup';
+import {getPlanContractType, getPlanStatusName} from '@/views/business/plan/setup';
 import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
 
 export default defineComponent({
@@ -113,6 +139,7 @@ export default defineComponent({
             formatValue,
             getPlanContractType,
             getPayCurrencyTypeEnumList,
+            getPlanStatusName,
         };
     },
 });

src/views/business/plan/components/modify/index.vue

@@ -12,6 +12,10 @@
                 type="primary"
                 :loading="loading"
                 @click="submit(2)">完成</a-button>
+        <a-button key="cancel"
+                  type="primary"
+                  :loading="loading"
+                  @click="cancel">取消</a-button>
     </template>
     <a-form class="inlineForm"
             ref="formRef"