Merge branch 'mtp_v6' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into mtp_v6

src/common/config/projectName.ts

@@ -22,4 +22,9 @@ export function isOemByEnum(type: OemType): boolean {
 // 是否是平安项目
 export function isPingAnOem() {
     return isOemByEnum(OemType.pingan)
+}
+
+// 是否是千海金
+export function isQianHaiJin() {
+    return isOemByEnum(OemType.qinghaijin)
 }

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

@@ -73,10 +73,16 @@ export interface Ermcp3ExposureDetail {
     enumdicname: string;//现货商品单位名称
     logtype: number;//类型 - 1:套保计划 2:现货合同
     middlegoodsId: number;//套保商品id
+    mgunitidname:string;//套保品种单位名称
+    mgunitid:number;//套保品种单位id
     middlegoodscode: string;//套保商品代码
     middlegoodsname: string;//套保商品名称
     qty: number;//数量
     relateNo: string;//现货合同/套保计划编号
+    unitid:number;//现货商品单位id
+    wrstandardcode:string;//现货商品代码
+    wrstandardid:number;//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string;//现货商品名称
 }
 
 /**

src/services/go/ermcp/goodsInfo/index.ts

@@ -6,7 +6,7 @@ import { getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go/index';
 import { QueryQuoteDay } from '../../quote';
 import {
-    Ermcp3Brand, Ermcp3GoodsGroup, Ermcp3MiddleGoodsDetailEx,
+    Ermcp3Brand, Ermcp3GoodsGroup,
     Ermcp3Wrstandard,
     ErmcpDeliveryGoodsDetailEx,
     ErmcpDeliveryGoodsReq,
@@ -14,6 +14,7 @@ import {
     Goods,
     Ermcp3MiddleGoodsDetail2
 } from './interface';
+import {Ermcp3MiddleGoodsDetail} from './interface/deliverygoodsdetail'
 
 /**
  * 查询现货商品 /Ermcp3/QueryDeliveryGoods
@@ -212,7 +213,7 @@ export function QueryMiddleGoods(status: number): Promise<ErmcpMiddleGoodsModel[
  * @param middlegoodsid 套保品种id
  * @constructor
  */
-export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3MiddleGoodsDetailEx[]> {
+export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3MiddleGoodsDetail[]> {
     const userid = getUserId(); // 用户id
     const usertype = getUserAccountType()  // 用户类型 2-机构 7-企业成员
     const param = middlegoodsid ? { userid, usertype, middlegoodsid } : { userid, usertype }

src/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail.ts

@@ -0,0 +1,82 @@
+/**
+ * 查询套保品种详情
+ */
+ export interface Ermcp3MiddleGoodsDetail {
+    areauserid:number //机构用户ID
+    enumdicname:string//单位名称
+    goodsunitid:number//套保品种单位id
+    gplst:TBGoodsGroup[]//期货品种列表
+    middlegoodscode:string//套保品种代码
+    middlegoodsid:number//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsnam:string//套保品种名称
+    needarbitrageratio:number//套利比率
+    needhedgeratio:number//套保比率
+    wdlst:TBWrstandard[]//商品信息列表(现货品类)
+    mg:ErmcpMiddleGoodsModel//套保品种
+}
+
+
+
+/**
+ * 套保品种
+ */
+ export interface ErmcpMiddleGoodsModel {
+    areauserid: number;//机构用户ID
+    createtime: string;//修改时间
+    enumdicname: string;//单位名称
+    evaluateratio: number;//估价系数
+    goodsgroupid: number;//关联期货品种ID
+    goodsunitid: number;//单位ID
+    isvalid: number;//状态 number;
+    //-无效(停用) 1-有效(正常)
+    middlegoodscode: string;//套保品种代码
+    middlegoodsid: number;//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    middlegoodsname: string;//套保品种名称
+    modifytime: string;//修改时间
+    needhedgeratio: number;//套保比率
+    qtydecimalplace: number;//数量小数位
+    relatedgoodsid: number;//关联交易商品ID
+    relatedgoodstype: number;//关联商品类型 - 1:期货合约 2:现货品种
+    remark: string;//备注
+}
+
+
+
+/**
+ * 商品信息列表(现货品类)
+ */
+ interface TBWrstandard{
+    convertratio:number//折算系数
+    deliverygoodsname:string//品种名称
+    enumdicname:string//单位名称
+    vatrate:number//增值税率
+    wrstandardcode:string//现货商品代码
+    wrstandardid:number//现货商品ID(SEQ_WRSTANDARD)
+    wrstandardname:string//现货商品名称
+}
+
+/**
+ * 期货品种列表
+ */
+ interface TBGoodsGroup{
+    convertratio:number//折算系数
+    enumdicname:string//单位名称
+    exexchangecode:string//交易所代码
+    exexchangename:string//交易所名称
+    gdlst:TBGoods[]//商品列表
+    goodsgroupid:Number//商品组ID(自增ID)
+    goodsgroupname:string//商品组名称
+    goodunitid:number//报价单位ID
+}
+
+/**
+ * 商品列表
+ */
+ interface TBGoods{
+    agreeunit:number//合约乘数
+    enumdicname:string//单位名称
+    goodscode:string//商品代码(内部)
+    goodsid:number//商品ID(自增ID SEQ_GOODS)
+    goodsname:string//商品名称
+
+}

src/services/proto/accountinfo/interface.ts

@@ -154,8 +154,8 @@ export interface TaaccountTransfersxmoneyRsp {
 // 客户资料操作请求 0 29 187
 export interface CustomerInfoOperateReq {
     operatetype: number // uint32 操作类型-1:新增 2:修改
-    userid: number // uint64 用户ID（修改时必填）
-    areaid: number // uint64 所属机构
+    userid?: number // uint64 用户ID（修改时必填）
+    areaid?: number // uint64 所属机构
     logincode?: string // string 登录帐号
     loginpwd?: string  // string 登录密码
     userinfotype: number // uint32 客户类型 1:个人  2:企业

src/views/business/exposure/list/realTime/index.vue

@@ -27,6 +27,9 @@
                 <template #middlegoodsname="{ record }" v-if="!isPingAnOem()">
                     <span>{{ record.middlegoodsname + '/' + record.middlegoodscode }}</span>
                 </template>
+                <template #goodsname="{ record }" v-if="!isPingAnOem()">
+                    <span>{{ record.goodsname + '/' + record.goodscode }}</span>
+                </template>
                 <template v-if="isPingAnOem()" #index="{ index }">
                     <span>{{ index + 1 }}</span>
                 </template>

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

@@ -78,16 +78,6 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="标仓系数"
-                       name="">
-            <a-input class="dialogInput"
-                     v-model:value="formState.ConvertFactor"
-                     readonly
-                     style="width: 200px"
-                     placeholder="请输入标仓系数" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
           <a-form-item label="计划量"
                        class="relative"
                        name="PlanQty">

src/views/information/custom/compoments/add/index.vue

@@ -1,195 +1,375 @@
 <template>
-    <!-- 平安客户资料 -->
-    <a-modal class="add-custom" title="新增客户资料" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false" v-if="isPingAnOem()" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">完成 </a-button>
+  <!-- 平安客户资料 -->
+  <a-modal class="add-custom"
+           title="新增客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           v-if="isPingAnOem()"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                class="cancelBtn"
+                :loading="loading"
+                :disabled="loading"
+                @click="submit(1)">完成 </a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+
+        <a-col :span="12">
+          <a-form-item label="客户类型"
+                       name="userinfotype">
+            <a-select class="typeSelect"
+                      style="width: 200px"
+                      v-model:value="formState.userinfotype"
+                      placeholder="请选择客户类型">
+              <a-select-option value="1"> 个人 </a-select-option>
+              <a-select-option value="2"> 企业 </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <template v-if="!isPersonal()">
+          <a-col :span="12">
+            <a-form-item label="企业名称"
+                         name="customername">
+              <a-input class="dialogInput"
+                       v-model:value="formState.customername"
+                       style="width: 200px"
+                       placeholder="请输入企业名称" />
+            </a-form-item>
+          </a-col>
+        </template>
+        <template v-else>
+          <a-col :span="12">
+            <a-form-item label="姓名"
+                         name="username">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.username"
+                       placeholder="请输入姓名" />
+            </a-form-item>
+          </a-col>
+        </template>
+        <a-col :span="12">
+          <a-form-item label="点价联系人"
+                       name="contactname">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="formState.contactname"
+                     placeholder="请输入联系人" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人手机号"
+                       name="mobilephone">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="formState.mobilephone"
+                     placeholder="请输入联系人手机号" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+  <!-- 其他项目客户资料 -->
+  <a-modal class="add-custom"
+           v-else
+           title="新增客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                class="cancelBtn"
+                :loading="loading"
+                :disabled="loading"
+                @click="submit(1)">保存草稿 </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                :disabled="loading"
+                @click="submit(2)">提交审核 </a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <template v-if="isQianHaiJin()">
+          <a-col :span="24">
+            <a-form-item label="所属机构"
+                         name="areaid">
+              <a-select class="typeSelect"
+                        style="width: 200px"
+                        v-model:value="formState.areaid"
+                        placeholder="请选择所属机构">
+                <a-select-option v-for="item in areaList"
+                                 :key="item.userid">
+                  {{ item.accountname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登录账号"
+                         name="logincode">
+              <a-input class="dialogInput"
+                       v-model:value="formState.logincode"
+                       style="width: 200px"
+                       placeholder="请选择登录账号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登录密码"
+                         name="loginpwd">
+              <a-input class="dialogInput"
+                       v-model:value="formState.loginpwd"
+                       style="width: 200px"
+                       placeholder="请选择登录密码" />
+            </a-form-item>
+          </a-col>
         </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型" name="userinfotype">
-                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.userinfotype" placeholder="请选择客户类型">
-                            <a-select-option value="1"> 个人 </a-select-option>
-                            <a-select-option value="2"> 企业 </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <template v-if="!isPersonal()">
-                    <a-col :span="12">
-                        <a-form-item label="企业名称" name="customername">
-                            <a-input class="dialogInput" v-model:value="formState.customername" style="width: 200px" placeholder="请输入企业名称" />
-                        </a-form-item>
-                    </a-col>
-                </template>
-                <template v-else>
-                    <a-col :span="12">
-                        <a-form-item label="姓名" name="username">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.username" placeholder="请输入姓名" />
-                        </a-form-item>
-                    </a-col>
-                </template>
-                <a-col :span="12">
-                    <a-form-item label="点价联系人" name="contactname">
-                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.contactname" placeholder="请输入联系人" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号" name="mobilephone">
-                        <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入联系人手机号" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
-    <!-- 其他项目客户资料 -->
-    <a-modal class="add-custom" v-else title="新增客户资料" v-model:visible="visible" @cancel="cancel" centered :maskClosable="false" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿 </a-button>
-            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交审核 </a-button>
+        <a-col :span="12">
+
+          <a-form-item label="客户类型"
+                       name="userinfotype">
+            <a-select class="typeSelect"
+                      style="width: 200px"
+                      v-model:value="formState.userinfotype"
+                      placeholder="请选择客户类型">
+              <a-select-option value="1"> 个人 </a-select-option>
+              <a-select-option value="2"> 企业 </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <template v-if="!isPersonal()">
+          <a-col :span="12">
+            <a-form-item label="企业名称"
+                         name="customername">
+              <a-input class="dialogInput"
+                       v-model:value="formState.customername"
+                       style="width: 200px"
+                       placeholder="请输入企业名称" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="企业简称"
+                         name="nickname">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.nickname"
+                       placeholder="请输入企业简称" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="证件类型"
+                         name="cardtype">
+              <a-select class="inlineFormSelect"
+                        v-model:value="formState.cardtype"
+                        style="width: 200px"
+                        placeholder="请选择证件类型">
+                <a-select-option :value="item.enumitemname"
+                                 v-for="item in cardTypeList"
+                                 :key="item.autoid">
+                  {{ item.enumdicname }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="法定代表人"
+                         name="legalpersonname">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.legalpersonname"
+                       placeholder="请输入法定代表人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="证件号码"
+                         name="cardnum">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.cardnum"
+                       placeholder="请输入证件号码" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="纳税人识别号"
+                         name="taxpayernum">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.taxpayernum"
+                       placeholder="请输入纳税人识别号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="营业执照">
+              <UploadImg :visible="visible"
+                         @upload="attachmentUpLoad" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系人"
+                         name="contactname">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.contactname"
+                       placeholder="请输入联系人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系人手机号"
+                         name="mobilephone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.mobilephone"
+                       placeholder="请输入联系人手机号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系电话"
+                         name="telphone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.telphone"
+                       placeholder="请输入联系电话" />
+            </a-form-item>
+          </a-col>
+        </template>
+        <template v-else>
+          <a-col :span="12">
+            <a-form-item label="姓名"
+                         name="username">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.username"
+                       placeholder="请输入姓名" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="身份证号码"
+                         name="cardnum">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.cardnum"
+                       placeholder="请输入身份证号码" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="手机号码"
+                         name="mobilephone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.mobilephone"
+                       placeholder="请输入手机号码" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="身份证正面照"
+                         name="cardbackphotourl">
+              <UploadImg :visible="visible"
+                         @upload="cardfrontphotourlUpLoad" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="邮箱"
+                         name="email">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.email"
+                       placeholder="请输入邮箱" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="身份证反面照"
+                         name="cardfrontphotourl">
+              <UploadImg :visible="visible"
+                         @upload="cardbackphotourlUpLoad" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系电话"
+                         name="telphone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.telphone"
+                       placeholder="请输入联系电话" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item> &nbsp; </a-form-item>
+          </a-col>
         </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型" name="userinfotype">
-                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.userinfotype" placeholder="请选择客户类型">
-                            <a-select-option value="1"> 个人 </a-select-option>
-                            <a-select-option value="2"> 企业 </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <template v-if="!isPersonal()">
-                    <a-col :span="12">
-                        <a-form-item label="企业名称" name="customername">
-                            <a-input class="dialogInput" v-model:value="formState.customername" style="width: 200px" placeholder="请输入企业名称" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="企业简称" name="nickname">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.nickname" placeholder="请输入企业简称" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="证件类型" name="cardtype">
-                            <a-select class="inlineFormSelect" v-model:value="formState.cardtype" style="width: 200px" placeholder="请选择证件类型">
-                                <a-select-option :value="item.enumitemname" v-for="item in cardTypeList" :key="item.autoid">
-                                    {{ item.enumdicname }}
-                                </a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="法定代表人" name="legalpersonname">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.legalpersonname" placeholder="请输入法定代表人" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="证件号码" name="cardnum">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入证件号码" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="纳税人识别号" name="taxpayernum">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.taxpayernum" placeholder="请输入纳税人识别号" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="营业执照">
-                            <UploadImg :visible="visible" @upload="attachmentUpLoad" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系人" name="contactname">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.contactname" placeholder="请输入联系人" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系人手机号" name="mobilephone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入联系人手机号" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系电话" name="telphone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
-                        </a-form-item>
-                    </a-col>
-                </template>
-                <template v-else>
-                    <a-col :span="12">
-                        <a-form-item label="姓名" name="username">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.username" placeholder="请输入姓名" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="身份证号码" name="cardnum">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入身份证号码" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="手机号码" name="mobilephone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入手机号码" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="身份证正面照" name="cardbackphotourl">
-                            <UploadImg :visible="visible" @upload="cardfrontphotourlUpLoad" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="邮箱" name="email">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.email" placeholder="请输入邮箱" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item label="身份证反面照" name="cardfrontphotourl">
-                            <UploadImg :visible="visible" @upload="cardbackphotourlUpLoad" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系电话" name="telphone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item> &nbsp; </a-form-item>
-                    </a-col>
-                </template>
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <a-select class="inlineFormSelect" style="width: 205px" v-model:value="formState.provinceid" @change="getCityList" placeholder="请选择省">
-                            <a-select-option v-for="item in provinceList" :key="item.autoid" :value="item.autoid">
-                                {{ item.divisionname }}
-                            </a-select-option>
-                        </a-select>
-                        <a-select class="inlineFormSelect ml9" style="width: 205px" v-model:value="formState.cityid" @change="getDistrictList" placeholder="请选择市">
-                            <a-select-option v-for="item in cityList" :key="item.autoid" :value="item.autoid">
-                                {{ item.divisionname }}
-                            </a-select-option>
-                        </a-select>
-                        <a-select class="inlineFormSelect ml9" v-model:value="formState.districtid" style="width: 205px" placeholder="请选择县(区)">
-                            <a-select-option v-for="item in districtList" :key="item.autoid" :value="item.autoid">
-                                {{ item.divisionname }}
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="&nbsp;" name="cardaddress">
-                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.cardaddress" placeholder="请输入详细地址" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="备注" name="remark">
-                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.remark" placeholder="请输入备注" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+        <a-col :span="24">
+          <a-form-item label="通讯地址">
+            <a-select class="inlineFormSelect"
+                      style="width: 205px"
+                      v-model:value="formState.provinceid"
+                      @change="getCityList"
+                      placeholder="请选择省">
+              <a-select-option v-for="item in provinceList"
+                               :key="item.autoid"
+                               :value="item.autoid">
+                {{ item.divisionname }}
+              </a-select-option>
+            </a-select>
+            <a-select class="inlineFormSelect ml9"
+                      style="width: 205px"
+                      v-model:value="formState.cityid"
+                      @change="getDistrictList"
+                      placeholder="请选择市">
+              <a-select-option v-for="item in cityList"
+                               :key="item.autoid"
+                               :value="item.autoid">
+                {{ item.divisionname }}
+              </a-select-option>
+            </a-select>
+            <a-select class="inlineFormSelect ml9"
+                      v-model:value="formState.districtid"
+                      style="width: 205px"
+                      placeholder="请选择县(区)">
+              <a-select-option v-for="item in districtList"
+                               :key="item.autoid"
+                               :value="item.autoid">
+                {{ item.divisionname }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="&nbsp;"
+                       name="cardaddress">
+            <a-input class="dialogInput"
+                     style="width: 635px"
+                     v-model:value="formState.cardaddress"
+                     placeholder="请输入详细地址" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="备注"
+                       name="remark">
+            <a-input class="dialogInput"
+                     style="width: 635px"
+                     v-model:value="formState.remark"
+                     placeholder="请输入备注" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
 import UploadImg from '@/common/components/uploadImg/index.vue';
-import { isPingAnOem } from '@/common/config/projectName';
+import { isPingAnOem, isQianHaiJin } from '@/common/config/projectName';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { validateAction } from '@/common/setup/form';
 import { _closeModal } from '@/common/setup/modal/modal';
@@ -199,9 +379,10 @@ import { getAddress } from '@/services/go/adress';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { addCustomerInfoOperate } from '@/services/proto/accountinfo';
 import { CustomerInfoOperateReq } from '@/services/proto/accountinfo/interface';
+import { toBase64String } from '@/utils/storage/base64';
 import { defineComponent, ref } from 'vue';
 import { FormState } from './interface';
-import { getCardType, handleForm } from './setup';
+import { getCardType, handleForm, handleAreaList } from './setup';
 
 export default defineComponent({
     name: 'add-custom',
@@ -223,6 +404,11 @@ export default defineComponent({
         const { getFirstImg: getBackImg, uploadImgAction: cardbackphotourlUpLoad } = getUploadImg();
         // 正面证件照地址
         const { getFirstImg: getFrontImg, uploadImgAction: cardfrontphotourlUpLoad } = getUploadImg();
+        //查询所属机构列表
+        const { areaList, getAreaList } = handleAreaList();
+        if (isQianHaiJin()) {
+            getAreaList(loading);
+        }
         function isPersonal(): boolean {
             return formState.userinfotype === '1';
         }
@@ -231,8 +417,7 @@ export default defineComponent({
             validateAction<FormState>(formRef, formState).then((param) => {
                 const reqParam: CustomerInfoOperateReq = {
                     operatetype: 1, // 1： 新增
-                    // userid: 1, // 写死 必填
-                    userid: getUserId(), // 写死 必填
+                    userid: getUserId(), // 必填
                     areaid: getUserId(),
                     userinfotype: Number(param.userinfotype),
                     username: Number(param.userinfotype) === 1 ? param.username : param.customername,
@@ -257,6 +442,12 @@ export default defineComponent({
                     email: param.email, // email
                     proxystatementurl: '',
                 };
+                if (isQianHaiJin()) {
+                    reqParam.areaid = param.areaid as number;
+                    reqParam.logincode = param.logincode;
+                    reqParam.loginpwd = toBase64String(toBase64String(param.loginpwd));
+                    reqParam.userstate = 2;
+                }
                 requestResultLoadingAndInfo(addCustomerInfoOperate, reqParam, loading, OperateType === 1 ? ['保存草稿成功', '保存草稿失败:'] : ['新增客户资料成功', '新增客户资料失败:']).then(() => {
                     cancel(true);
                 });
@@ -275,12 +466,14 @@ export default defineComponent({
             cityList,
             districtList,
             provinceList,
+            areaList,
             getCityList,
             getDistrictList,
             attachmentUpLoad,
             cardbackphotourlUpLoad,
             cardfrontphotourlUpLoad,
             isPingAnOem,
+            isQianHaiJin,
         };
     },
 });

src/views/information/custom/compoments/add/interface.ts

@@ -1,4 +1,8 @@
 export interface FormState {
+    areaid: number | undefined; //所属机构
+    logincode: string // string 登录帐号
+    loginpwd: string  // string 登录密码
+
     userinfotype: string; //客户类型
     customername: string; //客户名称(企业名称)
     nickname: string; //企业简称

src/views/information/custom/compoments/add/setup.ts

@@ -1,11 +1,14 @@
 
 import { getCardTypeEnumList } from '@/common/constants/enumsList';
+import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { validateCommon } from '@/common/setup/validate';
 import { QueryAddUserInfoApply } from '@/services/go/ermcp/customInfo';
 import { AddUserInfoApplyReq } from '@/services/go/ermcp/customInfo/interface';
+import { queryParentAreaList } from '@/services/go/ermcp/qhj';
+import { QhjParentAreaList } from '@/services/go/ermcp/qhj/interface';
 import { message } from 'ant-design-vue';
 import { RuleObject } from 'ant-design-vue/lib/form/interface';
-import { reactive, ref, UnwrapRef } from 'vue';
+import { reactive, Ref, ref, UnwrapRef } from 'vue';
 import { FormState } from './interface';
 
 /**
@@ -44,6 +47,9 @@ export function handleForm() {
  */
 export function initFormState(): FormState {
     return {
+        areaid: undefined,
+        logincode: '',
+        loginpwd: '',
         userinfotype: '2',
         customername: '',
         nickname: '',
@@ -81,4 +87,15 @@ export function handleApply() {
         }).finally(() => loading.value = false)
     }
     return { loading, applyAction }
+}
+
+// 查询所属机构列表
+export function handleAreaList() {
+    const areaList = ref<QhjParentAreaList[]>([])
+    function getAreaList(loading: Ref<boolean>) {
+        queryResultLoadingAndInfo(queryParentAreaList, loading).then(res => {
+            areaList.value = res
+        })
+    }
+    return { areaList, getAreaList }
 }

src/views/information/custom/compoments/modify/index.vue

@@ -1,140 +1,261 @@
 <template>
-    <!-- 修改客户资料 -->
-    <a-modal class="commonModal modify-custom" title="修改客户资料" v-if="visible" v-model:visible="visible" centered :maskClosable="false" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" :loading="loading" :disabled="loading" @click="submit(1)">保存草稿</a-button>
-            <a-button key="submit" type="primary" :loading="loading" :disabled="loading" @click="submit(2)">提交修改</a-button>
+  <!-- 修改客户资料 -->
+  <a-modal class="commonModal modify-custom"
+           title="修改客户资料"
+           v-if="visible"
+           v-model:visible="visible"
+           centered
+           :maskClosable="false"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                :disabled="loading"
+                @click="submit(2)">提交修改</a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="24"
+               v-if="isQianHaiJin()">
+          <a-form-item label="所属机构"
+                       name="areaid">
+            <a-select class="typeSelect"
+                      style="width: 200px"
+                      v-model:value="formState.areaid"
+                      placeholder="请选择所属机构">
+              <a-select-option v-for="item in areaList"
+                               :key="item.userid">{{ item.accountname }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="客户类型"
+                       name="userinfotype">
+            <a-select class="typeSelect"
+                      style="width: 200px"
+                      v-model:value="formState.userinfotype"
+                      placeholder="请选择客户类型">
+              <a-select-option value="1">个人</a-select-option>
+              <a-select-option value="2">企业</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <template v-if="!isPersonal()">
+          <a-col :span="12">
+            <a-form-item label="企业名称"
+                         name="customername">
+              <a-input class="dialogInput"
+                       v-model:value="formState.customername"
+                       style="width: 200px"
+                       placeholder="请输入企业名称" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="企业简称"
+                         name="nickname">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.nickname"
+                       placeholder="请输入企业简称" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="证件类型"
+                         name="cardtype">
+              <a-select class="inlineFormSelect"
+                        v-model:value="formState.cardtype"
+                        style="width: 200px"
+                        placeholder="请选择证件类型">
+                <a-select-option :value="item.enumitemname"
+                                 v-for="item in cardTypeList"
+                                 :key="item.autoid">{{ item.enumdicname }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="法定代表人"
+                         name="legalpersonname">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.legalpersonname"
+                       placeholder="请输入法定代表人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="证件号码"
+                         name="cardnum">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.cardnum"
+                       placeholder="请输入证件号码" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="纳税人识别号"
+                         name="taxpayernum">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.taxpayernum"
+                       placeholder="请输入纳税人识别号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="营业执照">
+              <UploadImg :visible="visible"
+                         :imgList="attachmentImgList"
+                         @upload="attachmentUpload" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系人"
+                         name="contactname">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.contactname"
+                       placeholder="请输入联系人" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系人手机号"
+                         name="mobilephone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.mobilephone"
+                       placeholder="请输入联系人手机号" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系电话"
+                         name="telphone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.telphone"
+                       placeholder="请输入联系电话" />
+            </a-form-item>
+          </a-col>
         </template>
-        <a-form class="inlineForm" ref="formRef" :model="formState" :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型" name="userinfotype">
-                        <a-select class="typeSelect" style="width: 200px" v-model:value="formState.userinfotype" placeholder="请选择客户类型">
-                            <a-select-option value="1">个人</a-select-option>
-                            <a-select-option value="2">企业</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <template v-if="!isPersonal()">
-                    <a-col :span="12">
-                        <a-form-item label="企业名称" name="customername">
-                            <a-input class="dialogInput" v-model:value="formState.customername" style="width: 200px" placeholder="请输入企业名称" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="企业简称" name="nickname">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.nickname" placeholder="请输入企业简称" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="证件类型" name="cardtype">
-                            <a-select class="inlineFormSelect" v-model:value="formState.cardtype" style="width: 200px" placeholder="请选择证件类型">
-                                <a-select-option :value="item.enumitemname" v-for="item in cardTypeList" :key="item.autoid">{{ item.enumdicname }}</a-select-option>
-                            </a-select>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="法定代表人" name="legalpersonname">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.legalpersonname" placeholder="请输入法定代表人" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="证件号码" name="cardnum">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入证件号码" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="纳税人识别号" name="taxpayernum">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.taxpayernum" placeholder="请输入纳税人识别号" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="营业执照">
-                            <UploadImg :visible="visible" :imgList="attachmentImgList" @upload="attachmentUpload" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系人" name="contactname">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.contactname" placeholder="请输入联系人" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系人手机号" name="mobilephone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入联系人手机号" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系电话" name="telphone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
-                        </a-form-item>
-                    </a-col>
-                </template>
-                <template v-else>
-                    <a-col :span="12">
-                        <a-form-item label="姓名" name="username">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.username" placeholder="请输入姓名" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="身份证号码" name="cardnum">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.cardnum" placeholder="请输入身份证号码" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="手机号码" name="mobilephone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.mobilephone" placeholder="请输入手机号码" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="身份证正面照" name="cardbackphotourl">
-                            <UploadImg :visible="visible" :imgList="cardfrontImgList" @upload="cardfrontUpload" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="邮箱" name="email">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.email" placeholder="请输入邮箱" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-item label="身份证反面照" name="cardfrontphotourl">
-                            <UploadImg :visible="visible" :imgList="cardbackImgList" @upload="cardbackUpload" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="联系电话" name="telphone">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.telphone" placeholder="请输入联系电话" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item>&nbsp;</a-form-item>
-                    </a-col>
-                </template>
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <a-select class="inlineFormSelect" style="width: 205px" v-model:value="formState.provinceid" @change="getCityList" placeholder="请选择省">
-                            <a-select-option v-for="item in provinceList" :key="item.autoid" :value="item.autoid">{{ item.divisionname }}</a-select-option>
-                        </a-select>
-                        <a-select class="inlineFormSelect ml9" style="width: 205px" v-model:value="formState.cityid" @change="getDistrictList" placeholder="请选择市">
-                            <a-select-option v-for="item in cityList" :key="item.autoid" :value="item.autoid">{{ item.divisionname }}</a-select-option>
-                        </a-select>
-                        <a-select class="inlineFormSelect ml9" v-model:value="formState.districtid" style="width: 205px" placeholder="请选择县(区)">
-                            <a-select-option v-for="item in districtList" :key="item.autoid" :value="item.autoid">{{ item.divisionname }}</a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="&nbsp;" name="cardaddress">
-                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.cardaddress" placeholder="请输入详细地址" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="备注" name="remark">
-                        <a-input class="dialogInput" style="width: 635px" v-model:value="formState.remark" placeholder="请输入备注" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+        <template v-else>
+          <a-col :span="12">
+            <a-form-item label="姓名"
+                         name="username">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.username"
+                       placeholder="请输入姓名" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="身份证号码"
+                         name="cardnum">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.cardnum"
+                       placeholder="请输入身份证号码" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="手机号码"
+                         name="mobilephone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.mobilephone"
+                       placeholder="请输入手机号码" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="身份证正面照"
+                         name="cardbackphotourl">
+              <UploadImg :visible="visible"
+                         :imgList="cardfrontImgList"
+                         @upload="cardfrontUpload" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="邮箱"
+                         name="email">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.email"
+                       placeholder="请输入邮箱" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="身份证反面照"
+                         name="cardfrontphotourl">
+              <UploadImg :visible="visible"
+                         :imgList="cardbackImgList"
+                         @upload="cardbackUpload" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="联系电话"
+                         name="telphone">
+              <a-input class="dialogInput"
+                       style="width: 200px"
+                       v-model:value="formState.telphone"
+                       placeholder="请输入联系电话" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item>&nbsp;</a-form-item>
+          </a-col>
+        </template>
+        <a-col :span="24">
+          <a-form-item label="通讯地址">
+            <a-select class="inlineFormSelect"
+                      style="width: 205px"
+                      v-model:value="formState.provinceid"
+                      @change="getCityList"
+                      placeholder="请选择省">
+              <a-select-option v-for="item in provinceList"
+                               :key="item.autoid"
+                               :value="item.autoid">{{ item.divisionname }}</a-select-option>
+            </a-select>
+            <a-select class="inlineFormSelect ml9"
+                      style="width: 205px"
+                      v-model:value="formState.cityid"
+                      @change="getDistrictList"
+                      placeholder="请选择市">
+              <a-select-option v-for="item in cityList"
+                               :key="item.autoid"
+                               :value="item.autoid">{{ item.divisionname }}</a-select-option>
+            </a-select>
+            <a-select class="inlineFormSelect ml9"
+                      v-model:value="formState.districtid"
+                      style="width: 205px"
+                      placeholder="请选择县(区)">
+              <a-select-option v-for="item in districtList"
+                               :key="item.autoid"
+                               :value="item.autoid">{{ item.divisionname }}</a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="&nbsp;"
+                       name="cardaddress">
+            <a-input class="dialogInput"
+                     style="width: 635px"
+                     v-model:value="formState.cardaddress"
+                     placeholder="请输入详细地址" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="备注"
+                       name="remark">
+            <a-input class="dialogInput"
+                     style="width: 635px"
+                     v-model:value="formState.remark"
+                     placeholder="请输入备注" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -152,7 +273,8 @@ import { CustomerInfoOperateReq } from '@/services/proto/accountinfo/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
 import { defineComponent, PropType, ref } from 'vue';
 import { FormState } from '../add/interface';
-import { getCardType, handleForm, initFormState } from '../add/setup';
+import { getCardType, handleAreaList, handleForm, initFormState } from '../add/setup';
+import { isPingAnOem, isQianHaiJin } from '@/common/config/projectName';
 
 export default defineComponent({
     name: 'modify-custom',
@@ -179,7 +301,11 @@ export default defineComponent({
         const { uploadImgAction: cardbackUpload, uploadImgList: cardbackImgList, handleImg: cardbackHandle } = getUploadImg();
         // 正面证件照地址
         const { uploadImgAction: cardfrontUpload, uploadImgList: cardfrontImgList, handleImg: cardfrontHandle } = getUploadImg();
-
+        //查询所属机构列表
+        const { areaList, getAreaList } = handleAreaList();
+        if (isQianHaiJin()) {
+            getAreaList(loading);
+        }
         function isPersonal(): boolean {
             return formState.userinfotype === '1';
         }
@@ -242,6 +368,12 @@ export default defineComponent({
                     email: param.email, // email
                     proxystatementurl: '',
                 };
+                if (isQianHaiJin()) {
+                    reqParam.areaid = param.areaid as number;
+                    reqParam.logincode = param.logincode;
+                    reqParam.loginpwd = param.loginpwd;
+                    reqParam.userstate = 2;
+                }
                 requestResultLoadingAndInfo(addCustomerInfoOperate, reqParam, loading, OperateType === 1 ? ['保存草稿成功', '保存草稿失败:'] : ['新增客户资料成功', '新增客户资料失败:']).then(() => {
                     cancel(true);
                 });
@@ -268,6 +400,8 @@ export default defineComponent({
             cardbackImgList,
             cardfrontUpload,
             cardfrontImgList,
+            isQianHaiJin,
+            areaList,
         };
     },
 });

src/views/information/custom/index.vue

@@ -4,7 +4,7 @@
         <Filter @search="updateColumn">
             <mtp-table-button class="btn-list-sticky" :buttons="addButton" @click="openComponent" />
         </Filter>
-        <a-table :columns="isPingAnOem() ? pingan_custom_column() : columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+        <a-table :columns="getColumns(columns)" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
             <!-- 额外的展开行 -->
             <template #expandedRowRender="{ record }">
                 <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts">
-import { isPingAnOem } from '@/common/config/projectName';
+import { isPingAnOem, isQianHaiJin } from '@/common/config/projectName';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { ComposeTableParam, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, MtpTableButton, queryTableList, useRouteName } from '@/common/export/commonTable';
 import { getTableButton } from '@/common/setup/table/button';
@@ -39,6 +39,8 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { getUserInfoTypeName, getStatusName, getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Filter from './compoments/filterTable/index.vue';
 import { pingan_custom_column } from './setup';
+import { ColumnType } from '@/common/methods/table';
+import { getTableColumns } from '@/common/setup/table';
 
 export default defineComponent({
     name: EnumRouterName.plan_audit,
@@ -78,6 +80,20 @@ export default defineComponent({
             }
         };
 
+        // 表头
+        const getColumns = (columns: ColumnType[]) => {
+            if (isPingAnOem()) {
+                // 平安
+                return pingan_custom_column();
+            } else if (isQianHaiJin()) {
+                // 千海金
+                const { columns: result, registerColumn } = getTableColumns();
+                registerColumn('table_pcweb_qhj_customer_info', []);
+                return result.value;
+            } else {
+                return columns;
+            }
+        };
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
@@ -98,6 +114,7 @@ export default defineComponent({
             isPingAnOem,
             getUserInfoTypeName,
             getCardTypeEnumItemName,
+            getColumns,
         };
     },
 });

src/views/information/custom/list/checkpending/index.vue

@@ -1,98 +0,0 @@
-<template>
-  <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
-  <!-- 客户信息: 正常 -->
-  <div class="custom_info_checkpending"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{}">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === 2 ? '企业' : '个人' }}</a>
-        </template>
-        <!-- 客户名称 -->
-        <template #customername="{ record }">
-          <a>{{ record.userinfotype === 2 ? record.customername : record.username }}</a>
-        </template>
-
-        <template #status="{ text }">
-          <a>{{ getStatusName(text) }}</a>
-        </template>
-        <template #cardtype="{ text }">
-          <a>{{ getCardTypeEnumItemName(text) }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <Middle :selectedRow="selectedRow"
-            @refresh="queryTable" />
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-
-import { filterCustomTable } from '../../compoments';
-import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/common/constants/enumsName';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-import Middle from '@/views/information/custom/compoments/controlModal/index.vue';
-
-export default defineComponent({
-    name: 'custom_info_checkpending',
-    components: {
-        filterCustomTable,
-        contextMenu,
-        BtnList,
-        Middle,
-    },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
-        // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_checkpending', true);
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(2);
-
-        initData(() => {
-            // 获取列表数据
-            queryTable();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_userinfo', ['userinfotype', 'nickname', 'contactname', 'mobile']);
-        });
-
-        return {
-            columns,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            commonBtn,
-            forDataBtn,
-            loading,
-            tableList,
-            updateColumn,
-            getStatusName,
-            getCardTypeEnumItemName,
-            queryTable,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom_info_checkpending {
-}
-</style>

src/views/information/custom/list/index.ts

@@ -1,6 +0,0 @@
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { queryTableList } from './setup';
-
-export { queryTableList };
-export type { QueryCustomInfoType };
-

src/views/information/custom/list/normal-use/index.vue

@@ -1,97 +0,0 @@
-<template>
-    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
-    <!-- 客户信息: 正常 -->
-    <div class="custom-normal" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <BtnList :btnList="commonBtn" />
-        </filterCustomTable>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{}">
-                    <BtnList :btnList="forDataBtn" />
-                </template>
-
-                <template v-if="isPingAnOem()" #index="{ index }">
-                    <span>{{ index + 1 }}</span>
-                </template>
-                <template #userinfotype="{ text }">
-                    <a>{{ text === 2 ? '企业' : '个人' }}</a>
-                </template>
-                <!-- 客户名称 -->
-                <template #customername="{ record }">
-                    <a>{{ record.userinfotype === 2 ? record.customername : record.username }}</a>
-                </template>
-                <template #status="{ text }">
-                    <a>{{ getStatusName(text) }}</a>
-                </template>
-                <template #cardtype="{ text }">
-                    <a>{{ getCardTypeEnumItemName(text) }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <Middle :selectedRow="selectedRow" @refresh="queryTable" />
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-
-import { filterCustomTable } from '../../compoments';
-import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/common/constants/enumsName';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-import Middle from '@/views/information/custom/compoments/controlModal/index.vue';
-import { isPingAnOem } from '@/common/config/projectName';
-import { pingan_custom_column } from '../setup';
-
-export default defineComponent({
-    name: 'custom-normal',
-    components: {
-        filterCustomTable,
-        contextMenu,
-        BtnList,
-        Middle,
-    },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
-        // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_normal', true);
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(3);
-        initData(() => {
-            // 获取列表数据
-            queryTable();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_userinfo', ['userinfotype', 'nickname', 'customername', 'mobile']);
-            // 平安表头
-            if (isPingAnOem()) {
-                columns.value = pingan_custom_column();
-            }
-        });
-        return {
-            columns,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            commonBtn,
-            forDataBtn,
-            loading,
-            tableList,
-            updateColumn,
-            getStatusName,
-            getCardTypeEnumItemName,
-            queryTable,
-            isPingAnOem,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom-normal {
-}
-</style>

src/views/information/custom/list/setup.ts

@@ -1,83 +0,0 @@
-import { queryTableList as query } from '@/common/setup/table/list';
-import { QueryCustomInfo } from '@/services/go/ermcp/customInfo';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { QueryCustomInfoEnum } from '@/services/go/ermcp/customInfo/type';
-
-/**
- * 获取表格列表数据
- * @param type
- * @returns
- */
-export function queryTableList(type: QueryCustomInfoEnum) {
-    const { loading, tableList, queryTable: temp } = query<QueryCustomInfoType>()
-    const fn = () => {
-        temp(QueryCustomInfo, type)
-    }
-    return { loading, tableList, queryTable: fn }
-}
-
-// 平安 客户资料 表头
-export function pingan_custom_column() {
-    return [
-        {
-            key: '9th',
-            dataIndex: 'index',
-            title: '序号',
-            align: 'center',
-            slots: {
-                customRender: 'index',
-            },
-            width: 80
-        },
-        {
-            key: '0th',
-            dataIndex: 'status',
-            title: '状态',
-            align: 'center',
-            slots: {
-                customRender: 'status',
-            },
-            width: 120
-        },
-        {
-            key: '1th',
-            dataIndex: 'userinfotype',
-            title: '客户类型',
-            align: 'center',
-            slots: {
-                customRender: 'userinfotype',
-            },
-            width: 120
-        },
-        {
-            key: '3th',
-            dataIndex: 'customername',
-            title: '客户名称',
-            align: 'center',
-            slots: {
-                customRender: 'customername',
-            },
-            width: 120
-        },
-        {
-            key: '6th',
-            dataIndex: 'contactname',
-            title: '点价联系人',
-            align: 'center',
-            slots: {
-                customRender: 'contactname',
-            },
-            width: 120
-        },
-        {
-            key: '7th',
-            dataIndex: 'mobile',
-            title: '联系人手机号码',
-            align: 'center',
-            slots: {
-                customRender: 'mobile',
-            },
-            width: 120
-        },
-    ]
-}

src/views/information/custom/list/stop-use/index.vue

@@ -1,98 +0,0 @@
-<template>
-    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
-    <!-- 客户信息: 停用 -->
-    <div class="custom-normal" :loading="loading">
-        <filterCustomTable @search="search">
-            <BtnList :btnList="commonBtn" />
-        </filterCustomTable>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :pagination="false" rowKey="key" :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{}">
-                    <BtnList :btnList="forDataBtn" />
-                </template>
-                <template v-if="isPingAnOem()" #index="{ index }">
-                    <span>{{ index + 1 }}</span>
-                </template>
-                <template #userinfotype="{ text }">
-                    <a>{{ text === 2 ? '企业' : '个人' }}</a>
-                </template>
-                <!-- 客户名称 -->
-                <template #customername="{ record }">
-                    <a>{{ record.userinfotype === 2 ? record.customername : record.username }}</a>
-                </template>
-                <template #status="{ text }">
-                    <a>{{ getStatusName(text) }}</a>
-                </template>
-                <template #cardtype="{ text }">
-                    <a>{{ getCardTypeEnumItemName(text) }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <Middle :selectedRow="selectedRow" @refresh="queryTable" />
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-
-import { filterCustomTable } from '../../compoments';
-
-import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/common/constants/enumsName';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-import Middle from '@/views/information/custom/compoments/controlModal/index.vue';
-import { isPingAnOem } from '@/common/config/projectName';
-import { pingan_custom_column } from '../setup';
-
-export default defineComponent({
-    name: 'custom-normal',
-    components: {
-        filterCustomTable,
-        contextMenu,
-        BtnList,
-        Middle,
-    },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
-        // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_disabled', true);
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(4);
-        initData(() => {
-            // 获取列表数据
-            queryTable();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_userinfo', ['userinfotype', 'nickname', 'contactname', 'mobile']);
-            // 平安表头
-            if (isPingAnOem()) {
-                columns.value = pingan_custom_column();
-            }
-        });
-        return {
-            columns,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            commonBtn,
-            forDataBtn,
-            loading,
-            tableList,
-            updateColumn,
-            getStatusName,
-            getCardTypeEnumItemName,
-            queryTable,
-            isPingAnOem,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom-normal {
-}
-</style
->;

src/views/information/custom/list/unsubmit/index.vue

@@ -1,96 +0,0 @@
-<template>
-  <!-- 客户信息: 正常 -->
-  <div class="custom_info_unsubmit"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === 2 ? '企业' : '个人' }}</a>
-        </template>
-        <!-- 客户名称 -->
-        <template #customername="{ record }">
-          <a>{{ record.userinfotype === 2 ? record.customername :  record.username }}</a>
-        </template>
-        <template #status="{ text }">
-          <a>{{ getStatusName(text) }}</a>
-        </template>
-        <template #cardtype="{ text }">
-          <a>{{ getCardTypeEnumItemName(text) }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <Middle :selectedRow="selectedRow"
-            @refresh="queryTable" />
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-
-import { filterCustomTable } from '../../compoments';
-import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/common/constants/enumsName';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
-import Middle from '@/views/information/custom/compoments/controlModal/index.vue';
-
-export default defineComponent({
-    name: 'custom_info_unsubmit',
-    components: {
-        filterCustomTable,
-        contextMenu,
-        BtnList,
-        Middle,
-    },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
-        // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_unsubmit', true);
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(1);
-        initData(() => {
-            // 获取列表数据
-            queryTable();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_userinfo', ['userinfotype', 'nickname', 'contactname', 'mobile']);
-        });
-
-        return {
-            columns,
-
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            commonBtn,
-            forDataBtn,
-            loading,
-            tableList,
-            updateColumn,
-            getStatusName,
-            getCardTypeEnumItemName,
-            queryTable,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.custom_info_unsubmit {
-}
-</style>

src/views/information/goods/list/hedging-variety/setup.ts

@@ -1,32 +1,42 @@
 import { QueryMiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo';
-import { Ermcp3MiddleGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';
+import { Ermcp3MiddleGoodsDetail } from '@/services/go/ermcp/goodsInfo/interface/deliverygoodsdetail';
 import { mergeObj } from '@/utils/objHandle';
 import { message } from 'ant-design-vue';
 import { reactive, ref } from 'vue';
 import { getInitMenuData } from '../../setup';
 
-export function initMG(): Ermcp3MiddleGoodsDetailEx {
+
+export function initMG(): Ermcp3MiddleGoodsDetail {
     return {
-        dglist: [],  // 关联的现货品种列表
-        gplist: [],  // 关联商品组列表
-        mg: {
-            areauserid: 0,
-            evaluateratio: 0,
-            goodsgroupid: 0,
-            isvalid: 0,
-            middlegoodsid: 0,
-            needhedgeratio: 0,
-            qtydecimalplace: 0,
-            relatedgoodsid: 0,
-            relatedgoodstype: 0,
-            goodsunitid: 0,
-            createtime: '',
-            enumdicname: '',
-            middlegoodscode: '',
-            middlegoodsname: '',
-            modifytime: '',
-            remark: '',
-        }
+        areauserid:0, //机构用户ID
+        enumdicname:'',//单位名称
+        goodsunitid:0,//套保品种单位id
+        gplst:[],//期货品种列表
+        middlegoodscode:'',//套保品种代码
+        middlegoodsid:0,//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+        middlegoodsnam:'',//套保品种名称
+        needarbitrageratio:0,//套利比率
+        needhedgeratio:0,//套保比率
+        wdlst:[],//商品信息列表(现货品类)
+        mg:{
+            areauserid: 0,//机构用户ID
+            createtime: '',//修改时间
+            enumdicname: '',//单位名称
+            evaluateratio: 0,//估价系数
+            goodsgroupid: 0,//关联期货品种ID
+            goodsunitid: 0,//单位ID
+            isvalid: 0,//状态 number;
+            //-无效(停用) 1-有效(正常)
+            middlegoodscode: '',//套保品种代码
+            middlegoodsid: 0,//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+            middlegoodsname: '',//套保品种名称
+            modifytime: '',//修改时间
+            needhedgeratio: 0,//套保比率
+            qtydecimalplace: 0,//数量小数位
+            relatedgoodsid: 0,//关联交易商品ID
+            relatedgoodstype: 0,//关联商品类型 - 1:期货合约 2:现货品种
+            remark: ''//备注
+            }
     }
 }
 
@@ -38,9 +48,9 @@ export function handleMG() {
     const { menuList, menuMap } = getInitMenuData('goods_info_hedge')
     const loading = ref<boolean>(false);
     // 套保品种列表
-    const MGList = ref<Ermcp3MiddleGoodsDetailEx[]>([])
+    const MGList = ref<Ermcp3MiddleGoodsDetail[]>([])
     // 选中的具体某一天套保品种数据
-    const selctedMG = reactive<Ermcp3MiddleGoodsDetailEx>(initMG())
+    const selctedMG = reactive<Ermcp3MiddleGoodsDetail>(initMG())
     const isNormal = ref<boolean>(true) // true => 正常； false => 停用
     function getMG(param?: number) {
         loading.value = true;

src/views/information/spot-contract/components/add/index.vue

@@ -71,6 +71,11 @@
                             <UploadImg :visible="visible" @upload="uploadImgAction" />
                         </a-form-item>
                     </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="交易主体" name="subjecttype">
+                            <a-input class="subjecttype" style="width: 200px" v-model:value="formState.ContractNo" placeholder="请输入交易主体" />
+                        </a-form-item>
+                    </a-col>
                 </a-row>
             </fieldset>
             <fieldset class="formFieldSet">
@@ -104,11 +109,6 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="12">
-                        <a-form-item label="标仓系数" name="ConvertFactor">
-                            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.ConvertFactor" readonly placeholder="选择商品后自动填入" />
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24">
                         <a-form-item label="商品规格" name="SpotGoodsDesc">
                             <a-input class="dialogInput" style="width: 200px" v-model:value="formState.SpotGoodsDesc" placeholder="请输入商品规格" />
                         </a-form-item>