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

src/services/funcode/index.ts

@@ -69,8 +69,8 @@ export const funCode: Code = {
     DeliveryGoodsCancelRsp: 1900674, // 现货品种停用响应
 
     // 仓库信息
-    WareHouseApplyReq: 1900685,     /// 仓库申请请求
-    WareHouseApplyRsp: 1900686,    /// 仓库申请响应
+    WarehouseApplyReq: 1900685,     /// 仓库申请请求
+    WarehouseApplyRsp: 1900686,    /// 仓库申请响应
     WarehouseStateChangeReq: 1900687,    /// 仓库状态修改请求
     WarehouseStateChangeRsp: 1900688,    /// 仓库状态修改响应
 

src/services/go/adress/index.ts

@@ -44,5 +44,31 @@ export function getAddress() {
             districtList.value = district.filter(e => e.parentcode === temp.divisioncode)
         }
     }
-    return { cityList, districtList, provinceList, getCityList, getDistrictList }
+    function getName(arr: Addresss[], autoid: number): string {
+        const temp = arr.find(e => e.autoid === autoid)
+        return temp ? temp.divisionname : '--'
+    }
+    /**
+     * 获取 省 名
+     * @param autoid 
+     */
+    function getProvinceName(autoid: number) {
+        return getName(provinceList.value, autoid)
+    }
+    /**
+     * 获取 市 名
+     * @param autoid 
+     */
+    function getCityName(autoid: number) {
+        return getName(city, autoid)
+    }
+    /**
+     * 获取 区 名
+     * @param autoid 
+     */
+    function getDistrictName(autoid: number) {
+        return getName(district, autoid)
+    }
+
+    return { cityList, districtList, provinceList, getCityList, getDistrictList, getProvinceName, getCityName, getDistrictName }
 }

src/services/go/config/index.ts

@@ -1,5 +1,4 @@
 import { request } from '@/services/request/index';
-import { ref } from 'vue';
 /**
  * 获取 config文件下的配置信息
  */
@@ -18,37 +17,3 @@ export const getCommonApiUrl = (apiUrl: string) => {
     });
 };
 
-export interface Addresss {
-    autoid: number
-    divisioncode: string
-    divisionlevel: "city" | "district" | "province"
-    divisionname: string
-    modifierid: number
-    modifytime: string
-    parentcode: string
-    pathname: string
-    postcode: string
-    separablename: string
-    shortcode: string
-}
-
-export function getAddress() {
-    const cityList = ref<Addresss[]>([]);
-    const districtList = ref<Addresss[]>([]);
-    const provinceList = ref<Addresss[]>([]);
-    request({ method: 'get', url: './config/address.json' }).then(res => {
-        res.data.forEach((el: Addresss) => {
-            const { divisionlevel } = el;
-            if (divisionlevel === 'city') { // 市
-                cityList.value.push(el)
-            } else if (divisionlevel === 'district') { // 区
-                districtList.value.push(el)
-            } else if (divisionlevel === 'province') { // 省
-                provinceList.value.push(el)
-            }
-        });
-    }).catch((err) => {
-        throw new Error('读取地址失败！');
-    })
-    return { cityList, districtList, provinceList }
-}

src/services/proto/warehouse/index.ts

@@ -34,7 +34,7 @@ export const addWarehouseApply = (param: WarehouseApplyReq): Promise<any> => {
         const package50 = buildProtoReq50(params);
         APP.sendTradingServer(package50, undefined, {
             onSuccess: (res) => {
-                const { isSuccess, result } = parseProtoRsp50(res, 'WareHouseApplyRsp');
+                const { isSuccess, result } = parseProtoRsp50(res, 'WarehouseApplyRsp');
                 if (isSuccess) {
                     resolve(result);
                 } else {

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

@@ -14,9 +14,7 @@
     </template>
     <fieldset class="formFieldSet">
       <legend>合同基本信息</legend>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
+      <a-form class="inlineForm">
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="合同编号">
@@ -64,9 +62,7 @@
     </fieldset>
     <fieldset class="formFieldSet">
       <legend>已登记信息</legend>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
+      <a-form class="inlineForm">
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="已定价量">
@@ -83,9 +79,7 @@
     </fieldset>
     <fieldset class="formFieldSet">
       <legend>本次点价信息</legend>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
+      <a-form class="inlineForm">
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="升贴水">

src/views/information/account_info/compoments/cancel/index.vue

@@ -14,109 +14,107 @@
                 :loading="loading"
                 @click="submit">确认撤销</a-button>
     </template>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
-          <a-row :gutter="24">
-              <a-col :span="12">
-                  <a-form-item label="客户类型">
-                      <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="企业名称">
-                      <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="证件类型">
-                      <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="证件号码">
-                      <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="营业执照">
-                      <div class="upload">
-                          <div class="look">查看附件</div>
-                      </div>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-          <a-row :gutter="24">
-              <a-col :span="12">
-                  <a-form-item label="联系人">
-                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="联系人手机号">
-                      <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="状态">
-                      <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-          <a-row :gutter="24">
-              <a-col :span="24">
-                  <a-form-item label="通讯地址">
-                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-          <a-row :gutter="24">
-              <a-col :span="24">
-                  <a-form-item label="备注">
-                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-      </a-form>
+    <a-form class="inlineForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="客户类型">
+            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="企业名称">
+            <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件类型">
+            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件号码">
+            <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="营业执照">
+            <div class="upload">
+              <div class="look">查看附件</div>
+            </div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系人">
+            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人手机号">
+            <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态">
+            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="通讯地址">
+            <span class="white">{{ formatValue(selectedRow.address) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="备注">
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {message, Modal} from 'ant-design-vue';
-import { ModifyUserInfoReq, QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
-import {formatValue} from "@/common/methods";
-import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
-import {cancelCustomInfo} from "@/views/information/custom/compoments/setup";
+import { message, Modal } from 'ant-design-vue';
+import { ModifyUserInfoReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { formatValue } from '@/common/methods';
+import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { cancelCustomInfo } from '@/views/information/custom/compoments/setup';
 
 export default defineComponent({
     name: 'custom_info_btn_cancel',
@@ -127,9 +125,9 @@ export default defineComponent({
             default: {},
         },
     },
-    setup(props,context) {
+    setup(props, context) {
         const { visible, cancel } = closeModal('custom_info_btn_cancel');
-        const {loading, ModifyUserInfo} = cancelCustomInfo()
+        const { loading, ModifyUserInfo } = cancelCustomInfo();
         function submit() {
             loading.value = true;
             Modal.confirm({
@@ -139,20 +137,21 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');
-                    const req : ModifyUserInfoReq = {
-                        userid: props.selectedRow.userid,//用户ID
-                        userstate: 1,       //开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
-                    }
+                    const req: ModifyUserInfoReq = {
+                        userid: props.selectedRow.userid, //用户ID
+                        userstate: 1, //开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
+                    };
                     // 撤销申请 将状态设置为未提交
                     ModifyUserInfo(req)
-                        .then(res => {
-                            message.success(res)
+                        .then((res) => {
+                            message.success(res);
                             // 通知上层  刷新数据
                             context.emit('refresh');
                             cancel();
-                        }).catch(err => {
-                            message.error(err)
                         })
+                        .catch((err) => {
+                            message.error(err);
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -165,7 +164,6 @@ export default defineComponent({
             // }, 2000);
         }
 
-
         return {
             visible,
             cancel,

src/views/information/account_info/list/account_info_trade/index.vue

@@ -2,60 +2,93 @@
   <!-- 交易账户 -->
   <div class="account_info_trade"
        :loading="loading">
-    交易账户
+    <filterCustomTable @search="search"></filterCustomTable>
+    <div class="tltLeft">
+      <span class="blue">
+        <svg class="icon svg-icon"
+             aria-hidden="true">
+          <use xlink:href="#icon-shuzhuangtu"></use>
+        </svg>
+        {{getUserName()}}
+      </span>
+    </div>
+    <a-collapse class="spotCollapse"
+                :bordered="false">
+      <template #expandIcon="props">
+        <svg class="icon svg-icon"
+             aria-hidden="true"
+             v-if="props.isActive == 0">
+          <use xlink:href="#icon-shouqi1"></use>
+        </svg>
+        <svg class="icon svg-icon"
+             aria-hidden="true"
+             v-else>
+          <use xlink:href="#icon-shouqi2"></use>
+        </svg>
+      </template>
+      <a-collapse-panel>
+        <template #header>
+          <a-row class="headRow">
+            <a-col :span="12">跟单员（3）</a-col>
+            <a-col :span="12">
+              <BtnList :btnList="commonBtn" />
+            </a-col>
+          </a-row>
+        </template>
+        <a-collapse class="spotCollapse"
+                    v-for="(item, i) in traderList"
+                    :key="i + '11'"
+                    :bordered="false">
+          <a-collapse-panel :show-arrow="false">
+            <template #header>
+              <a-row class="headRow">
+                <a-col :span="12">{{item.rolename}}</a-col>
+                <a-col :span="12">{{getAccountStatus(item.accountstatus)}}</a-col>
+              </a-row>
+            </template>
+            <BtnList :btnList="forDataBtn" />
+          </a-collapse-panel>
+        </a-collapse>
+      </a-collapse-panel>
+    </a-collapse>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-
-// import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom} from '../../compoments';
-// import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
-import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { defineComponent, initData, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
+import { ref } from 'vue';
+import { handleAccountManager, getAccountStatus } from '../setup';
+import { getUserName } from '@/services/bus/user';
 
 export default defineComponent({
     name: 'account_info_trade',
     components: {
         contextMenu,
         BtnList,
+        filterCustomTable,
     },
     setup() {
-        // // 表头数据
-        // const {columns, registerColumn, updateColumn, filteredInfo} = 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', getFilterTableCB);
-        // });
+        const { traderList, getRoleList } = handleAccountManager();
+        console.log('traderList', traderList);
+
+        const { commonBtn, forDataBtn } = getBtnList('account_info_trade', true);
+        const loading = ref<boolean>(false);
+        initData(() => {
+            getRoleList();
+        });
 
-        // // 查询
-        // function search(value: any) {
-        //     filteredInfo.value = value;
-        //     // 更新表信息
-        //     updateColumn();
-        // }
+        // 查询
+        function search(value: any) {}
 
         return {
-            // columns,
-            // filteredInfo,
-            // expandedRowKeys,
-            // selectedRow,
-            // Rowclick,
-            // commonBtn,
-            // forDataBtn,
-            // loading,
-            // tableList,
-            // search,
-            // getStatusName,
-            // getCardTypeName,
-            // queryTable,
+            commonBtn,
+            forDataBtn,
+            loading,
+            search,
+            traderList,
+            getAccountStatus,
+            getUserName,
         };
     },
 });

src/views/information/account_info/list/interface.ts

@@ -1,4 +0,0 @@
-export interface Value {
-    id: number,
-    name: string,
-}

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

@@ -1,11 +1,10 @@
 import { Column, ColumnType } from '@/common/setup/table/index';
 import { getItemEnum } from '@/services/bus/allEnum';
 import { QueryAccMgrLoginUser } from '@/services/go/ermcp/account';
-import { ErmcpLoginUser } from '@/services/go/ermcp/account/interface';
+import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { message } from 'ant-design-vue';
 import { ref } from 'vue';
-import { Value } from './interface';
 
 /**
  * 处理 /账号列表： 交易用户 业务员 跟单员
@@ -13,19 +12,20 @@ import { Value } from './interface';
  */
 export function handleAccountManager() {
     // 交易用户
-    const traderList = ref<Value[]>([])
+    const traderList = ref<ErmcpLoginUserEx[]>([])
     function getRoleList() {
         QueryAccMgrLoginUser(2).then(res => {
             const set = new Set<number>([])
             traderList.value.length = 0;
             res.forEach(e => {
                 const { roleid, rolename, accountstatus } = e;
-                if (accountstatus === 4) {  // 账户的状态 - 4 正常
-                    if (!set.has(roleid)) { // 去重
-                        set.add(roleid)
-                        traderList.value.push({ id: roleid, name: rolename })
-                    }
+                // if (accountstatus === 4) {  // 账户的状态 - 4 正常
+                if (!set.has(roleid)) { // 去重
+                    set.add(roleid)
+                    // traderList.value.push({ id: roleid, name: rolename })
+                    traderList.value.push(e)
                 }
+                // }
             })
         }).catch(err => message.error(err))
     }
@@ -102,22 +102,40 @@ export function getFilterTableCB(e: Column, item: ColumnType, filtered: any) {
 /**
  *获取仓登录状态
  */
-export function getLoginStatus(type: number) {
+export function getLoginStatus(type: number): string {
     const temp = getItemEnum('loginstatus').find(e => e.enumitemname === type)
     return temp ? temp.enumdicname : '--'
 }
-// export function getLoginStatus(type: number) {
-//     let result = '--'
-//     switch(type) {
-//         case 1:
-//         result = '正常'
-//         break;
-//         case 2:
-//         result = '冻结'
-//         break;
-//         case 3:
-//         result = '无效'
-//         break;
-//     }
-//     return result
-// }
+
+/**
+ * 获取账户状态
+ * @param type 
+ * @returns 
+ */
+export function getAccountStatus(type: number) {
+    let result = '--'
+    switch (type) {
+        case 1:
+            result = '正常'
+            break;
+        case 2:
+            result = '待审核'
+            break;
+        case 3:
+            result = '待复审'
+            break;
+        case 4:
+            result = '正常'
+            break;
+        case 5:
+            result = '审核拒绝'
+            break;
+        case 6:
+            result = '停用'
+            break;
+        case 7:
+            result = '注销'
+            break;
+    }
+    return result
+}

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

@@ -14,109 +14,107 @@
                 :loading="loading"
                 @click="submit">确认撤销</a-button>
     </template>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
-          <a-row :gutter="24">
-              <a-col :span="12">
-                  <a-form-item label="客户类型">
-                      <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="企业名称">
-                      <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="证件类型">
-                      <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="证件号码">
-                      <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="营业执照">
-                      <div class="upload">
-                          <div class="look">查看附件</div>
-                      </div>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-          <a-row :gutter="24">
-              <a-col :span="12">
-                  <a-form-item label="联系人">
-                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="联系人手机号">
-                      <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
-                  </a-form-item>
-              </a-col>
-              <a-col :span="12">
-                  <a-form-item label="状态">
-                      <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-          <a-row :gutter="24">
-              <a-col :span="24">
-                  <a-form-item label="通讯地址">
-                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-          <a-row :gutter="24">
-              <a-col :span="24">
-                  <a-form-item label="备注">
-                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                  </a-form-item>
-              </a-col>
-          </a-row>
-      </a-form>
+    <a-form class="inlineForm">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="客户类型">
+            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="企业名称">
+            <span class="white">{{ formatValue(selectedRow.customername)}}</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.nickname) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件类型">
+            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</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.legalpersonname) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件号码">
+            <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</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.taxpayernum) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="营业执照">
+            <div class="upload">
+              <div class="look">查看附件</div>
+            </div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系人">
+            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人手机号">
+            <span class="white">{{ formatValue(selectedRow.mobile) }}</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.telphone) }}</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态">
+            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="通讯地址">
+            <span class="white">{{ formatValue(selectedRow.address) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="备注">
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {message, Modal} from 'ant-design-vue';
-import { ModifyUserInfoReq, QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
-import {formatValue} from "@/common/methods";
-import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
-import {cancelCustomInfo} from "@/views/information/custom/compoments/setup";
+import { message, Modal } from 'ant-design-vue';
+import { ModifyUserInfoReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { formatValue } from '@/common/methods';
+import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { cancelCustomInfo } from '@/views/information/custom/compoments/setup';
 
 export default defineComponent({
     name: 'custom_info_btn_cancel',
@@ -127,9 +125,9 @@ export default defineComponent({
             default: {},
         },
     },
-    setup(props,context) {
+    setup(props, context) {
         const { visible, cancel } = closeModal('custom_info_btn_cancel');
-        const {loading, ModifyUserInfo} = cancelCustomInfo()
+        const { loading, ModifyUserInfo } = cancelCustomInfo();
         function submit() {
             loading.value = true;
             Modal.confirm({
@@ -139,20 +137,21 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');
-                    const req : ModifyUserInfoReq = {
-                        userid: props.selectedRow.userid,//用户ID
-                        userstate: 1,       //开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
-                    }
+                    const req: ModifyUserInfoReq = {
+                        userid: props.selectedRow.userid, //用户ID
+                        userstate: 1, //开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
+                    };
                     // 撤销申请 将状态设置为未提交
                     ModifyUserInfo(req)
-                        .then(res => {
-                            message.success(res)
+                        .then((res) => {
+                            message.success(res);
                             // 通知上层  刷新数据
                             context.emit('refresh');
                             cancel();
-                        }).catch(err => {
-                            message.error(err)
                         })
+                        .catch((err) => {
+                            message.error(err);
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -165,7 +164,6 @@ export default defineComponent({
             // }, 2000);
         }
 
-
         return {
             visible,
             cancel,

src/views/information/goods/components/modify/index.vue

@@ -285,6 +285,7 @@ import { FormState, WRSConvertDetailEx } from './interface';
 import { validateCommon } from '@/common/setup/validate';
 import { initDG } from '../../list/spot-variety/setup';
 import { ErmcpDeliveryGoodsDetailEx, ErmcpDeliveryGoods } from '@/services/go/ermcp/goodsInfo/interface';
+import { mergeTwoObj } from '@/utils/objHandle';
 interface Obj {
     [props: string]: any;
 }
@@ -374,18 +375,7 @@ export default defineComponent({
         watchEffect(() => {
             if (props.selctedDeliveryGoods.data.deliverygoodsname) {
                 const { data, gblist, gmlist, mgList } = props.selctedDeliveryGoods;
-                console.log('props.selctedDeliveryGoods', props.selctedDeliveryGoods);
-                // 处理第一次加载的
-                const obj: Obj = {};
-                Object.keys(formState).forEach((el) => {
-                    const key = el.toLocaleLowerCase() as keyof ErmcpDeliveryGoods;
-                    if (Reflect.has(data, key)) {
-                        obj[el] = data[key];
-                    } else {
-                        console.warn(`${key}不对应`);
-                    }
-                });
-                Object.assign(formState, obj);
+                mergeTwoObj(formState, props.selctedDeliveryGoods);
                 // 单位
                 formState.unitid = data.agreeunit;
                 // 品类

src/views/information/spot-contract/components/add/setup.ts

@@ -32,8 +32,8 @@ export function addContractReq() {
             SpotGoodsDesc: form.SpotGoodsDesc, //                商品规格
             PriceType: form.PriceType,//                         定价类型
             CurrencyID: form.CurrencyID as number,//             结算币种
-            Qty: Number(form.Qty as number), //                     数量
-            Price: Number(form.Price as number), //                 价格
+            Qty: Number(form.Qty), //                     数量
+            Price: Number(form.Price), //                 价格
             TradeDate: moment().format("YYYYMMDD"),//             交易日
             SignDate: moment().format("YYYY-MM-DD HH:mm:ss"), //  签订日期
             // 以上必填

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

@@ -8,189 +8,182 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
+      <a-button key="submit"
                 class="cancelBtn"
                 @click="cancel">取消</a-button>
-        <a-button key="submit"
+      <a-button key="submit"
                 type="primary"
                 :loading="loading"
                 @click="submit">确认撤销</a-button>
     </template>
-      <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">{{ formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同类型">
-                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="业务类型">
-                          <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="采购方">
-                          <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同附件">
-                          <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="数量">
-                          <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="升贴水">
-                          <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价期">
-                          <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="交收期">
-                          <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="业务员">
-                          <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="期货账户">
-                          <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同类型">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="业务类型">
+              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="采购方">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同附件">
+              <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="数量">
+              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="升贴水">
+              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价期">
+              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交收期">
+              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务员">
+              <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="期货账户">
+              <span class="white">{{ formatValue(selectedRow.accountid) }}</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>
 
 <script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {Ermcp3ContractRsp} from "@/services/go/ermcp/spot-contract/interface";
-import {formatTime, formatValue} from "@/common/methods";
-import {
-    getBizTypeName,
-    getContractStatusName,
-    getContractTypeName,
-    getPriceTypeName
-} from "@/views/information/spot-contract/setup";
-import {message, Modal} from "ant-design-vue";
-import { orderContractOperateControl } from "@/views/information/spot-contract/components/setup";
-import {SpotContractOperateReq} from "@/services/proto/spotcontract/interface";
-import Long from "long";
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { formatTime, formatValue } from '@/common/methods';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { message, Modal } from 'ant-design-vue';
+import { orderContractOperateControl } from '@/views/information/spot-contract/components/setup';
+import { SpotContractOperateReq } from '@/services/proto/spotcontract/interface';
+import Long from 'long';
 
 export default defineComponent({
     name: 'spot-contract-detail',
@@ -211,20 +204,19 @@ export default defineComponent({
                 okText: '确认撤销',
                 cancelText: '取消',
                 onOk() {
-                    const params : SpotContractOperateReq = {
+                    const params: SpotContractOperateReq = {
                         SpotContractID: Long.fromString(props.selectedRow.spotcontractid),
                         OperateType: 5,
                         Remark: '',
-                    }
+                    };
                     // 撤销合同
                     orderContractOperateControl(params, loading)
-                        .then(res => {
+                        .then((res) => {
                             // 通知上层  刷新数据
                             context.emit('refresh');
                             cancel();
-                        }).catch(err => {
-
-                    });
+                        })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -11,186 +11,179 @@
       <a-button key="submit"
                 class="cancelBtn"
                 @click="cancel">取消</a-button>
-        <a-button key="submit"
+      <a-button key="submit"
                 type="primary"
                 :loading="loading"
                 @click="submit">确认删除</a-button>
     </template>
-      <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">{{ formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同类型">
-                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="业务类型">
-                          <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="采购方">
-                          <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同附件">
-                          <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="数量">
-                          <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="升贴水">
-                          <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价期">
-                          <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="交收期">
-                          <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="业务员">
-                          <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="期货账户">
-                          <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同类型">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="业务类型">
+              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="采购方">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同附件">
+              <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="数量">
+              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="升贴水">
+              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价期">
+              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交收期">
+              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务员">
+              <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="期货账户">
+              <span class="white">{{ formatValue(selectedRow.accountid) }}</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>
 
 <script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {Ermcp3ContractRsp} from "@/services/go/ermcp/spot-contract/interface";
-import {formatTime, formatValue} from "@/common/methods";
-import {
-    getBizTypeName,
-    getContractStatusName,
-    getContractTypeName,
-    getPriceTypeName
-} from "@/views/information/spot-contract/setup";
-import {message, Modal} from "ant-design-vue";
-import {orderContractControl} from "@/views/information/spot-contract/components/setup";
-import {GldErmcpSpotContractOperateReq} from "@/services/proto/spotcontract/interface";
-import Long from "long";
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { formatTime, formatValue } from '@/common/methods';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { message, Modal } from 'ant-design-vue';
+import { orderContractControl } from '@/views/information/spot-contract/components/setup';
+import { GldErmcpSpotContractOperateReq } from '@/services/proto/spotcontract/interface';
+import Long from 'long';
 
 export default defineComponent({
     name: 'delete-spot-contract',
@@ -214,16 +207,16 @@ export default defineComponent({
                     let params: GldErmcpSpotContractOperateReq = {
                         SpotContractID: props.selectedRow.spotcontractid,
                         OperateType: 3,
-                        Remark: "",
-                    }
+                        Remark: '',
+                    };
                     // 删除客户资料
                     orderContractControl(params, loading)
-                        .then(res => {
+                        .then((res) => {
                             // 通知上层  刷新数据
                             context.emit('refresh');
                             cancel();
-                        }).catch(err => {
-                    });
+                        })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -13,64 +13,69 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-     <a-tabs v-model:activeKey="activeKey">
-      <a-tab-pane key="1" tab="合同详情"></a-tab-pane>
-      <a-tab-pane key="2" tab="点价记录"></a-tab-pane>
-      <a-tab-pane key="3" tab="交收记录"></a-tab-pane>
-      <a-tab-pane key="4" tab="款项记录"></a-tab-pane>
-      <a-tab-pane key="5" tab="发票记录"></a-tab-pane>
-      <a-tab-pane key="6" tab="入库记录"></a-tab-pane>
-      <a-tab-pane key="7" tab="变更记录"></a-tab-pane>
+    <a-tabs v-model:activeKey="activeKey">
+      <a-tab-pane key="1"
+                  tab="合同详情"></a-tab-pane>
+      <a-tab-pane key="2"
+                  tab="点价记录"></a-tab-pane>
+      <a-tab-pane key="3"
+                  tab="交收记录"></a-tab-pane>
+      <a-tab-pane key="4"
+                  tab="款项记录"></a-tab-pane>
+      <a-tab-pane key="5"
+                  tab="发票记录"></a-tab-pane>
+      <a-tab-pane key="6"
+                  tab="入库记录"></a-tab-pane>
+      <a-tab-pane key="7"
+                  tab="变更记录"></a-tab-pane>
     </a-tabs>
     <a-form class="inlineForm"
-            v-if="activeKey == 1"
-            :form="form"
-            @submit="handleSearch">
+            v-if="activeKey == 1">
       <fieldset class="formFieldSet">
         <legend>基本信息</legend>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="合同编号">
-                <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="合同类型">
-                <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="业务类型">
-                <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="采购方">
-                <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="合同附件">
-                <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="24">
-            <a-col :span="12">
-              <a-form-item label="状态">
-                <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同类型">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="业务类型">
+              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="采购方">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同附件">
+              <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </fieldset>
       <fieldset class="formFieldSet">
         <legend>现货信息</legend>
@@ -180,10 +185,14 @@
         </a-row>
       </fieldset>
     </a-form>
-    <div class="tableDatas" v-if="activeKey == 2">
-      <a-table class="dialogTable" :columns="columns" :data-source="data" :pagination="false">
+    <div class="tableDatas"
+         v-if="activeKey == 2">
+      <a-table class="dialogTable"
+               :columns="columns"
+               :data-source="data"
+               :pagination="false">
         <template #status="{ text }">
-          <span class="yellow">{{ text }}</span>  
+          <span class="yellow">{{ text }}</span>
           <!-- 审核通过'green' 审核拒绝 'orange' 待审核'yellow'   -->
         </template>
       </a-table>
@@ -197,14 +206,9 @@ import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { getStatusName } from '@/views/information/custom/setup';
-import {
-    getBizTypeName,
-    getContractStatusName,
-    getContractTypeName,
-    getPriceTypeName
-} from '@/views/information/spot-contract/setup';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 import { formatValue, formatTime } from '@/common/methods/format';
-import {v4 as uuidv4} from "uuid";
+import { v4 as uuidv4 } from 'uuid';
 
 export default defineComponent({
     name: 'spot-contract-detail',
@@ -220,103 +224,99 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
         function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 200);
-        };
+            cancel();
+        }
         const columns = [
-          {
-            title: '序号',
-            dataIndex: 'no',
-            key: 'no',
-            align: 'center'
-          },
-          {
-            title: '点价登记时间',
-            dataIndex: 'time',
-            key: 'time',
-            align: 'center'
-          },
-          {
-            title: '点价审核时间',
-            dataIndex: 'adutTime',
-            key: 'adutTime',
-            align: 'center'
-          },
-          {
-            title: '点价价格',
-            dataIndex: 'price',
-            key: 'price',
-            align: 'center'
-          },
-          {
-            title: '升贴水',
-            dataIndex: 'money',
-            key: 'money',
-            align: 'center'
-          },
-          {
-            title: '点价数量',
-            dataIndex: 'num',
-            key: 'num',
-            align: 'center'
-          },
-          {
-            title: '点价金额',
-            dataIndex: 'pointAmount',
-            key: 'pointAmount',
-            align: 'center'
-          },
-          {
-            title: '申请人',
-            dataIndex: 'apply',
-            key: 'apply',
-            align: 'center'
-          },
-          {
-            title: '审核人',
-            dataIndex: 'adutPerson',
-            key: 'adutPerson',
-            align: 'center'
-          },
-          {
-            title: '状态',
-            dataIndex: 'status',
-            key: 'status',
-            align: 'center',
-            slots: { customRender: 'status' },
-          }
+            {
+                title: '序号',
+                dataIndex: 'no',
+                key: 'no',
+                align: 'center',
+            },
+            {
+                title: '点价登记时间',
+                dataIndex: 'time',
+                key: 'time',
+                align: 'center',
+            },
+            {
+                title: '点价审核时间',
+                dataIndex: 'adutTime',
+                key: 'adutTime',
+                align: 'center',
+            },
+            {
+                title: '点价价格',
+                dataIndex: 'price',
+                key: 'price',
+                align: 'center',
+            },
+            {
+                title: '升贴水',
+                dataIndex: 'money',
+                key: 'money',
+                align: 'center',
+            },
+            {
+                title: '点价数量',
+                dataIndex: 'num',
+                key: 'num',
+                align: 'center',
+            },
+            {
+                title: '点价金额',
+                dataIndex: 'pointAmount',
+                key: 'pointAmount',
+                align: 'center',
+            },
+            {
+                title: '申请人',
+                dataIndex: 'apply',
+                key: 'apply',
+                align: 'center',
+            },
+            {
+                title: '审核人',
+                dataIndex: 'adutPerson',
+                key: 'adutPerson',
+                align: 'center',
+            },
+            {
+                title: '状态',
+                dataIndex: 'status',
+                key: 'status',
+                align: 'center',
+                slots: { customRender: 'status' },
+            },
         ];
 
         const data = [
-          {
-            key: '1',
-            no: '1',
-            time: '20-12-01 19:37',
-            adutTime: '20-12-01 20:37',
-            price: '1000.00',
-            money: '100',
-            num: '1',
-            pointAmount: '10100.00',
-            apply: 'lishunli',
-            adutPerson: 'wamgping',
-            status: '审核通过'
-          },
-          {
-            key: '2',
-            no: '2',
-            time: '20-12-01 19:37',
-            adutTime: '20-12-01 20:37',
-            price: '1000.00',
-            money: '100',
-            num: '1',
-            pointAmount: '10100.00',
-            apply: 'lishunli',
-            adutPerson: 'wamgping',
-            status: '审核驳回'
-          },
+            {
+                key: '1',
+                no: '1',
+                time: '20-12-01 19:37',
+                adutTime: '20-12-01 20:37',
+                price: '1000.00',
+                money: '100',
+                num: '1',
+                pointAmount: '10100.00',
+                apply: 'lishunli',
+                adutPerson: 'wamgping',
+                status: '审核通过',
+            },
+            {
+                key: '2',
+                no: '2',
+                time: '20-12-01 19:37',
+                adutTime: '20-12-01 20:37',
+                price: '1000.00',
+                money: '100',
+                num: '1',
+                pointAmount: '10100.00',
+                apply: 'lishunli',
+                adutPerson: 'wamgping',
+                status: '审核驳回',
+            },
         ];
         return {
             visible,
@@ -332,7 +332,7 @@ export default defineComponent({
             getBizTypeName,
             activeKey: ref('1'),
             columns,
-            data
+            data,
         };
     },
 });
@@ -340,58 +340,58 @@ export default defineComponent({
 
 <style lang="less">
 .custom-detail {
-  .ant-modal-content {
-    .ant-modal-body {
-      padding-top: 0;
-      padding-left: 0;
-      padding-right: 0;
-      .ant-tabs {
-        background: @m-black11;
-        width: 100%;
-        padding: 0 24px;
-        .ant-tabs-bar {
-          margin-bottom: 0;
-          border-bottom: 0;
-        }
-        .ant-tabs-nav-container {
-          .ant-tabs-nav-wrap {
-            .ant-tabs-nav {
-              .ant-tabs-tab {
-                width: 70px;
-                margin-right: 43px;
-                text-align: center;
-                font-size: 16px;
-                color: #88A0AE;
-                padding: 0;
-                line-height: 45px; 
-              }
-              .ant-tabs-tab-active.ant-tabs-tab {
-                color: #3A87F7;
-              }
-              .ant-tabs-ink-bar {
-                width: 70px !important;
-                background: #3A87F7;
-                .rounded-corners(1px);
-              }
+    .ant-modal-content {
+        .ant-modal-body {
+            padding-top: 0;
+            padding-left: 0;
+            padding-right: 0;
+            .ant-tabs {
+                background: @m-black11;
+                width: 100%;
+                padding: 0 24px;
+                .ant-tabs-bar {
+                    margin-bottom: 0;
+                    border-bottom: 0;
+                }
+                .ant-tabs-nav-container {
+                    .ant-tabs-nav-wrap {
+                        .ant-tabs-nav {
+                            .ant-tabs-tab {
+                                width: 70px;
+                                margin-right: 43px;
+                                text-align: center;
+                                font-size: 16px;
+                                color: #88a0ae;
+                                padding: 0;
+                                line-height: 45px;
+                            }
+                            .ant-tabs-tab-active.ant-tabs-tab {
+                                color: #3a87f7;
+                            }
+                            .ant-tabs-ink-bar {
+                                width: 70px !important;
+                                background: #3a87f7;
+                                .rounded-corners(1px);
+                            }
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
-  .tableDatas {
-    margin-top: 26px;
-    padding: 0 24px;
-    overflow: hidden;
-    .dialogTable {
-      width: 100%;
-      overflow: overlay;
+    .tableDatas {
+        margin-top: 26px;
+        padding: 0 24px;
+        overflow: hidden;
+        .dialogTable {
+            width: 100%;
+            overflow: overlay;
+        }
+    }
+    .ant-form.inlineForm {
+        margin-top: 20px;
+        padding: 0 24px;
     }
-  }
-  .ant-form.inlineForm {
-      margin-top: 20px;
-      padding: 0 24px;
-  }
 }
 </style
 >;

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

@@ -8,189 +8,182 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-       <a-button key="submit"
+      <a-button key="submit"
                 class="cancelBtn"
                 @click="cancel">取消</a-button>
-        <a-button key="submit"
+      <a-button key="submit"
                 type="primary"
                 :loading="loading"
                 @click="submit">确认完结</a-button>
     </template>
-      <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">{{ formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同类型">
-                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="业务类型">
-                          <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="采购方">
-                          <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同附件">
-                          <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="数量">
-                          <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="升贴水">
-                          <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="点价期">
-                          <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="交收期">
-                          <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="业务员">
-                          <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="期货账户">
-                          <span class="white">{{ formatValue(selectedRow.accountid) }}</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-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同类型">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="业务类型">
+              <span class="white">{{ getBizTypeName(selectedRow.biztype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="采购方">
+              <span class="white">{{ formatValue(selectedRow.buyusername) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同附件">
+              <span class="white">{{ formatValue(selectedRow.contracctstatus) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="yellow">{{ formatValue(getContractStatusName(selectedRow.contracctstatus)) }}</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.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.brandname) }}</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.spotgoodsdesc) }}</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">{{ getPriceTypeName(formatValue(selectedRow.pricetype)) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="数量">
+              <span class="white">{{ formatValue(selectedRow.qty) }}</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.goodscode) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="升贴水">
+              <span class="white">{{ formatValue(selectedRow.pricemove) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="点价期">
+              <span class="white">{{ formatValue(formatTime(selectedRow.startdate, "d") + '--' + formatTime(selectedRow.enddate, "d")) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="交收期">
+              <span class="white">{{ formatValue(formatTime(selectedRow.deliverystartdate, "d") + '--' + formatTime(selectedRow.deliveryenddate, "d"))}}</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.contractmargin) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="业务员">
+              <span class="white">{{ formatValue(selectedRow.saleuserlogincode) }}</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.meruserlogincode) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="期货账户">
+              <span class="white">{{ formatValue(selectedRow.accountid) }}</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>
 
 <script lang="ts">
-import {defineComponent, PropType, ref} from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import {formatTime, formatValue} from "@/common/methods";
-import {
-    getBizTypeName,
-    getContractStatusName,
-    getContractTypeName,
-    getPriceTypeName
-} from "@/views/information/spot-contract/setup";
-import {Ermcp3ContractRsp} from "@/services/go/ermcp/spot-contract/interface";
-import {orderContractOperateControl} from "@/views/information/spot-contract/components/setup";
-import {message, Modal} from "ant-design-vue";
-import {SpotContractOperateReq} from "@/services/proto/spotcontract/interface";
-import Long from "long";
+import { formatTime, formatValue } from '@/common/methods';
+import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
+import { orderContractOperateControl } from '@/views/information/spot-contract/components/setup';
+import { message, Modal } from 'ant-design-vue';
+import { SpotContractOperateReq } from '@/services/proto/spotcontract/interface';
+import Long from 'long';
 
 export default defineComponent({
     name: 'spot-contract-detail',
@@ -215,15 +208,15 @@ export default defineComponent({
                         SpotContractID: props.selectedRow.spotcontractid,
                         OperateType: 6,
                         Remark: '',
-                    }
+                    };
                     // 完结合同
                     orderContractOperateControl(params, loading)
-                        .then(res => {
+                        .then((res) => {
                             // 通知上层  刷新数据
                             context.emit('refresh');
                             cancel();
-                        }).catch(err => {
-                    });
+                        })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/information/spot-contract/components/interface.ts

@@ -14,8 +14,8 @@ export interface FormState {
     ConvertFactor: number | undefined  // double 标仓系数
     SpotGoodsDesc: string // string 商品型号
     PriceType: number // uint32 定价类型-1:一口价2:点价3:暂定价
-    Qty: number | null // double 数量
-    Price: number | null// double 价格暂定价[1:一口价、3:暂定价]
+    Qty: string // double 数量
+    Price: string// double 价格暂定价[1:一口价、3:暂定价]
     Amount: number | null// double 金额[1:一口价、3:暂定价]
     DeliveryStartDate: string// string 交收期(开始)
     DeliveryEndDate: string // string 交收期(结束)

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 修改现货合同-->
+  <!-- 重新提交现货合同-->
   <a-modal class="commonModal modify-custom"
-           title="修改现货合同"
+           title="重新提交现货合同"
            v-if="visible"
            v-model:visible="visible"
            @cancel="cancel"
@@ -418,6 +418,8 @@ import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { handleAccountManager } from '../setup';
 import { Moment } from 'moment';
 import { handleFormRule, handleContract, handleDeliveryGoods, handleAmout, handlePrice, handleDate, handleFromState } from '../setup';
+import { addContractReq } from '@/views/information/spot-contract/components/add/setup';
+import { mergeTwoObj } from '@/utils/objHandle';
 
 interface Obj {
     [props: string]: any;
@@ -434,6 +436,7 @@ export default defineComponent({
     setup(props, context) {
         const { visible, cancel } = closeModal('spot_contract_btn_modify');
         const loading = ref<boolean>(false);
+        const { sendReq } = addContractReq();
         const { formState, businessType } = handleFromState();
         console.log('props.selectedRow', props.selectedRow);
 
@@ -461,21 +464,52 @@ export default defineComponent({
             // formState.ContractAttachment = new Uint8Array()
             // formState.SpotGoodsBrandID = +props.selectedRow.spotcontractid
             if (props.selectedRow.contractno) {
-                // 处理第一次加载的
-                const obj: Obj = {};
-                Object.keys(formState).forEach((el) => {
-                    const key = el.toLocaleLowerCase() as keyof Ermcp3ContractRsp;
-                    if (Reflect.has(props.selectedRow, key)) {
-                        obj[el] = props.selectedRow[key];
-                    } else {
-                        console.warn(`${key}不对应`);
-                    }
-                });
-                Object.assign(formState, obj);
-                props.selectedRow.deliverygoodsid && deliveryGoodsChange(props.selectedRow.deliverygoodsid);
+                mergeTwoObj(formState, props.selectedRow);
+                const { deliverygoodsid, qty, price } = props.selectedRow;
+                deliverygoodsid && deliveryGoodsChange(deliverygoodsid);
+                formState.Qty = qty.toString();
+                formState.Price = price.toString();
             }
         });
-        function submit() {}
+        function submit() {
+            formRef.value
+                .validate()
+                .then(() => {
+                    const param = toRaw(formState);
+                    const id = getUsrId();
+                    isSell.value ? (param.SellUserID = id) : (param.BuyUserID = id);
+                    const fn = (value: Moment) => {
+                        return formatTime(value, 'd') + ' ' + '00:00:00';
+                    };
+                    // 交收期
+                    const dDate = deliveryDate.value;
+                    if (dDate.length) {
+                        const DeliveryStartDate = fn(dDate[0]);
+                        const DeliveryEndDate = fn(dDate[1]);
+                        Object.assign(param, { DeliveryStartDate, DeliveryEndDate });
+                    }
+
+                    // 点价期
+                    const pDate = priceDate.value;
+                    if (pDate.length && param.PriceType !== 1) {
+                        // 点价日期[2:点价3:暂定价]
+                        const StartDate = fn(pDate[0]);
+                        const EndDate = fn(pDate[1]);
+                        Object.assign(param, { StartDate, EndDate });
+                    }
+                    console.log('values', formState);
+
+                    sendReq(param, loading, 2)
+                        .then((res) => {
+                            context.emit('refresh');
+                            cancel();
+                        })
+                        .catch((err) => {});
+                })
+                .catch((error: ValidateErrorEntity<FormState>) => {
+                    console.log('error', error);
+                });
+        }
         initData(() => {
             queryCustomList();
             getDeliveryGoods();

src/views/information/spot-contract/components/setup.ts

@@ -149,8 +149,8 @@ export function handleFromState() {
         ConvertFactor: undefined,// double 标仓系数
         SpotGoodsDesc: '', // string 商品型号
         PriceType: 1, // uint32 定价类型-1:一口价2:点价3:暂定价
-        Qty: null, // double 数量
-        Price: null,// double 价格暂定价[1:一口价、3:暂定价]
+        Qty: '', // double 数量
+        Price: '',// double 价格暂定价[1:一口价、3:暂定价]
         Amount: null, // double 金额[1:一口价、3:暂定价]
         DeliveryStartDate: '', // string 交收期(开始)
         DeliveryEndDate: '', // string 交收期(结束)
@@ -406,7 +406,7 @@ export function handleDate() {
 export function handleAmout(formState: UnwrapRef<FormState>) {
     function getAmout() {
         const { Price, Qty } = formState
-        formState.Amount = (Price && Qty) ? Price * Qty : 0
+        formState.Amount = (Price && Qty) ? Number(Price) * Number(Qty) : 0
     }
     return { getAmout }
 }

src/views/information/warehouse-info/compoments/add/index.vue

@@ -8,6 +8,10 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="cancel">取消</a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
@@ -128,19 +132,25 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, toRaw } from 'vue';
+import {defineComponent, PropType, ref, toRaw} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods/index';
 import { getAddress } from '@/services/go/adress';
 import { handleForm, getWarehouseType, FormState, warehouseApply } from '../setup';
 import { ValidateErrorEntity } from 'ant-design-vue/lib/form/interface';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { WarehouseApplyReq } from '@/services/proto/warehouse/interface';
+import {ErmcpWareHouseInfo} from "@/services/go/ermcp/warehouse-info/interface";
 
 export default defineComponent({
     name: 'warehouse_info_btn_add',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<ErmcpWareHouseInfo>,
+            default: {},
+        },
+    },
+    setup(props, context) {
         const { visible, cancel } = closeModal('warehouse_info_btn_add');
         const loading = ref<boolean>(false);
         const { cityList, districtList, provinceList, getCityList, getDistrictList } = getAddress();
@@ -150,8 +160,28 @@ export default defineComponent({
             formRef.value
                 .validate()
                 .then(() => {
-                    const param = toRaw(formState) as WarehouseApplyReq;
-                    warehouseApply(param, loading);
+                    const param = toRaw(formState)
+                    const reqParam: WarehouseApplyReq = {
+                        type: 1,// int32 类型 1 新增 2 修改
+                        warehouseid: param.warehouseid, // uint64 仓库ID
+                        warehousecode: param.warehousecode, // string 仓库代码
+                        warehousename: param.warehousename, // string 仓库名称
+                        warehousetype: undefined === param.warehousetype ? 0 : param.warehousetype as number,  // int32 仓库类型 - 1 厂库  2 自有库  3 合作库
+                        provinceid: undefined === param.provinceid ? 0 : param.provinceid as number,  // uint64 省
+                        cityid: undefined === param.cityid ? 0 : param.cityid as number,  // uint64 市
+                        districtid: undefined === param.districtid ? 0 : param.districtid as number,  // int32 区
+                        address: param.address, // string 详细地址
+                        contactname: param.contactname, // string 联系人
+                        contactnum: param.contactnum, // string 联系电话
+                    }
+                    warehouseApply(reqParam, loading)
+                        .then(res => {
+                            cancel()
+                            context.emit("refresh")
+                        })
+                        .catch(err => {
+
+                        })
                     console.log('param', param);
                 })
                 .catch((error: ValidateErrorEntity<FormState>) => {

src/views/information/warehouse-info/compoments/detail/index.vue

@@ -55,7 +55,7 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="所在地区">
-            <span class="white">{{ formatValue(selectedRow.address) }}</span>
+            <span class="white">{{ getProvinceName(selectedRow.provinceid) + getCityName(selectedRow.cityid) + getDistrictName(selectedRow.districtid) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -73,8 +73,9 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
-import { gerWareHouseStatusName, getWareHouseTypeName } from '@/views/information/warehouse-info/setup';
+import {gerWareHouseStatusName, getAddressInfo, getWareHouseTypeName} from '@/views/information/warehouse-info/setup';
 import { formatValue } from '@/common/methods';
+import {getAddress} from "@/services/go/adress";
 
 export default defineComponent({
     name: 'warehouse_info_btn-detail',
@@ -85,12 +86,14 @@ export default defineComponent({
             default: {},
         },
     },
-    setup() {
+    setup(props, context) {
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+        const {getProvinceName, getCityName, getDistrictName} = getAddress();
         function submit() {
             cancel();
+            context.emit('refresh')
         }
         return {
             visible,
@@ -101,6 +104,9 @@ export default defineComponent({
             getWareHouseTypeName,
             formatValue,
             maskClosableFlag,
+            getProvinceName,
+            getCityName,
+            getDistrictName,
         };
     },
 });

src/views/information/warehouse-info/compoments/modify/index.vue

@@ -11,7 +11,11 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="cancel">关闭</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">修改</a-button>
     </template>
     <a-form class="inlineForm"
             ref="formRef"
@@ -80,7 +84,7 @@
             <a-select class="inlineFormSelect"
                       style="width: 205px"
                       v-model:value="formState.provinceid"
-                      @change="getCityList"
+                      @change="provinceChange"
                       placeholder="请选择省">
               <a-select-option v-for="item in provinceList"
                                :key="item.autoid"
@@ -91,7 +95,7 @@
             <a-select class="inlineFormSelect ml9"
                       style="width: 205px"
                       v-model:value="formState.cityid"
-                      @change="getDistrictList"
+                      @change="cityChange"
                       placeholder="请选择市">
               <a-select-option v-for="item in cityList"
                                :key="item.autoid"
@@ -148,7 +152,7 @@ export default defineComponent({
         },
     },
     components: {},
-    setup(props) {
+    setup(props, context) {
         const { visible, cancel } = closeModal('warehouse_info_btn_modify');
         const loading = ref<boolean>(false);
         const { cityList, districtList, provinceList, getCityList, getDistrictList } = getAddress();
@@ -158,21 +162,53 @@ export default defineComponent({
             if (props.selectedRow.warehousename) {
                 console.log('props.selectedRow,', props.selectedRow);
                 mergeTwoObj(formState, props.selectedRow);
+                const { provinceid, cityid } = props.selectedRow;
+                if (provinceid) {
+                    getCityList(provinceid);
+                }
+                if (cityid) {
+                    getDistrictList(cityid);
+                }
             }
         });
         function submit() {
             formRef.value
                 .validate()
                 .then(() => {
-                    const param = toRaw(formState) as WarehouseApplyReq;
-                    param.type = 2;
-                    warehouseApply(param, loading);
-                    console.log('param', param);
+                    const param = toRaw(formState);
+                    const reqParam: WarehouseApplyReq = {
+                        type: 2, // int32 类型 1 新增 2 修改
+                        warehouseid: props.selectedRow.autoid, // uint64 仓库ID
+                        warehousecode: props.selectedRow.warehousecode, // string 仓库代码
+                        warehousename: param.warehousename, // string 仓库名称
+                        warehousetype: undefined === param.warehousetype ? 0 : (param.warehousetype as number), // int32 仓库类型 - 1 厂库  2 自有库  3 合作库
+                        provinceid: undefined === param.provinceid ? 0 : (param.provinceid as number), // uint64 省
+                        cityid: undefined === param.cityid ? 0 : (param.cityid as number), // uint64 市
+                        districtid: undefined === param.districtid ? 0 : (param.districtid as number), // int32 区
+                        address: param.address, // string 详细地址
+                        contactname: param.contactname, // string 联系人
+                        contactnum: param.contactnum, // string 联系电话
+                    };
+                    warehouseApply(reqParam, loading)
+                        .then((res) => {
+                            cancel();
+                            context.emit('refresh');
+                        })
+                        .catch((err) => {});
                 })
                 .catch((error: ValidateErrorEntity<FormState>) => {
                     console.log('error', error);
                 });
         }
+        function provinceChange(id: number) {
+            getCityList(id);
+            formState.cityid = undefined;
+            formState.districtid = undefined;
+        }
+        function cityChange(id: number) {
+            getDistrictList(id);
+            formState.districtid = undefined;
+        }
         return {
             visible,
             cancel,
@@ -182,8 +218,8 @@ export default defineComponent({
             cityList,
             districtList,
             provinceList,
-            getCityList,
-            getDistrictList,
+            provinceChange,
+            cityChange,
             formRef,
             formState,
             rules,

src/views/information/warehouse-info/compoments/setup.ts

@@ -123,7 +123,6 @@ export function warehouseApply(param: WarehouseApplyReq, loading: Ref<boolean>)
     loading.value = true
     // 获取提示信息
     const sign = getRequestResultInfo(warehouseApplyRequestResultMsg, param.type)  // 接口请求后的返回提示 这里统一进行管理
-    addWarehouseApply(param)
     // 接口调用
     const result = addWarehouseApply(param)
     // 接口调用结果处理，提示成功或者失败信息，并关闭loading效果

src/views/information/warehouse-info/list/normal-use/index.vue

@@ -26,7 +26,8 @@
       </a-table>
     </contextMenu>
     <!-- 新增仓库信息 -->
-    <Add />
+    <Add  :selectedRow="selectedRow"
+          @refresh="queryTable" />
     <!-- 停用仓库信息 -->
     <Disable :selectedRow="selectedRow"
              @refresh="queryTable" />

src/views/information/warehouse-info/list/stop-use/index.vue

@@ -24,17 +24,18 @@
         </template>
       </a-table>
     </contextMenu>
-    <!-- 新增仓库信息 -->
-    <Add />
     <!-- 恢复仓库信息 -->
     <Recover :selectedRow="selectedRow"
              @refresh="queryTable" />
+    <!-- 仓库信息详情 -->
+    <Detail :selectedRow="selectedRow"
+            @refresh="queryTable" />
   </div>
 </template>
 
 <script lang="ts">
 import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
-import { filterCustomTable, Add, Recover } from '../../compoments';
+import { filterCustomTable, Detail, Recover } from '../../compoments';
 import { gerWareHouseStatusName, getWareHouseTypeName, queryTableList, getFilterTableCB, ErmcpWareHouseInfo } from '../index';
 
 export default defineComponent({
@@ -42,7 +43,7 @@ export default defineComponent({
     components: {
         contextMenu,
         filterCustomTable,
-        Add,
+        Detail,
         Recover,
         BtnList,
     },

src/views/information/warehouse-info/setup.ts

@@ -1,4 +1,5 @@
 import { ResultInfo } from "@/common/methods/request";
+import {getAddress} from "@/services/go/adress";
 
 /**
  * 仓库状态名称 - 1:正常 2:注销 3:待审核 4:审核拒绝
@@ -43,6 +44,15 @@ export function getWareHouseTypeName(type: number): string {
     return result
 }
 
+/**
+ * 获取地址信息
+ */
+export function getAddressInfo(provinceId: number, cityId: number, districId: number): string{
+   const {getProvinceName, getCityName, getDistrictName} = getAddress();
+   return getProvinceName(provinceId) + getCityName(cityId) + getDistrictName(districId);
+}
+
+
 /************** 接口相关提示 **************** /
  *
  */

src/views/manage/business-review/components/settlementAudit/index.vue

@@ -12,89 +12,87 @@
                 type="primary"
                 :loading="loading"
                 @click="submit">关闭</a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="pass">审核通过
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="refuse">审核拒绝
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="pass">审核通过
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="refuse">审核拒绝
+      </a-button>
     </template>
-      <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">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="点价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.reckonrealqty) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="其它费用">
-                          <span class="white">{{ formatValue(selectedRow.reckonotheramount) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="调整保证金">
-                          <span class="white">{{
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.reckonrealqty) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="其它费用">
+              <span class="white">{{ formatValue(selectedRow.reckonotheramount) }}</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.addmargin !== 0 ? "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
                               }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="调整金额">
-                          <span class="white">{{ formatValue(selectedRow.reckonadjustamount) }}</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.applytime) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记人">
-                          <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </fieldset>
-      </a-form>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="调整金额">
+              <span class="white">{{ formatValue(selectedRow.reckonadjustamount) }}</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.applytime) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记人">
+              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -105,12 +103,12 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {QryBussinessJsRsp} from "@/services/go/ermcp/business-review/interface";
-import {Modal} from "ant-design-vue";
-import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
-import Long from "long";
-import {somePriceControl} from "@/views/manage/business-review/components/setup";
-import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";
+import { QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';
+import { Modal } from 'ant-design-vue';
+import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import Long from 'long';
+import { somePriceControl } from '@/views/manage/business-review/components/setup';
+import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'business_review_settlement_audit',
@@ -142,15 +140,13 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 2,
-                    }
+                    };
                     somePriceControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -158,7 +154,7 @@ export default defineComponent({
             });
         }
         // 审核拒绝
-        function refuse(){
+        function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
                 okText: '确认审核拒绝',
@@ -167,15 +163,10 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 3,
-                    }
+                    };
                     somePriceControl(param, loading)
-                        .then(res => [
-                            context.emit('refresh'),
-                            cancel()
-                        ])
-                        .catch(err => {
-
-                        })
+                        .then((res) => [context.emit('refresh'), cancel()])
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/business-review/components/settlementDetail/index.vue

@@ -13,78 +13,76 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-      <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">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="点价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.reckonrealqty) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="其它费用">
-                          <span class="white">{{ formatValue(selectedRow.reckonotheramount) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="调整保证金">
-                          <span class="white">{{
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.reckonrealqty) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="其它费用">
+              <span class="white">{{ formatValue(selectedRow.reckonotheramount) }}</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.addmargin !== 0 ? "+" + formatValue(selectedRow.addmargin) : (selectedRow.decmargin === 0 ? 0.0 : "-" + formatValue(selectedRow.decmargin)))
                               }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="调整金额">
-                          <span class="white">{{ formatValue(selectedRow.reckonadjustamount) }}</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.applytime) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记人">
-                          <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </fieldset>
-      </a-form>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="调整金额">
+              <span class="white">{{ formatValue(selectedRow.reckonadjustamount) }}</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.applytime) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记人">
+              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -95,8 +93,8 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";
-import {QryBusinessDjRsp, QryBussinessJsRsp} from "@/services/go/ermcp/business-review/interface";
+import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { QryBusinessDjRsp, QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';
 
 export default defineComponent({
     name: 'settlement-detail',
@@ -113,8 +111,7 @@ export default defineComponent({
         const maskClosableFlag = ref<boolean>(false);
         function submit() {
             context.emit('refresh');
-            cancel()
-
+            cancel();
         }
         return {
             visible,

src/views/manage/finance-review/components/fundsDetail/index.vue

@@ -13,64 +13,62 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-      <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">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="点价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">{{ kxtypeName(selectedRow.kxtype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记金额">
-                          <span class="white">{{ formatValue(selectedRow.deductamount) }}</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.applytime) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记人">
-                          <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </fieldset>
-      </a-form>
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">{{ kxtypeName(selectedRow.kxtype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记金额">
+              <span class="white">{{ formatValue(selectedRow.deductamount) }}</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.applytime) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记人">
+              <span class="white">{{ formatValue(selectedRow.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -80,9 +78,9 @@ import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {QryBussinessKxRsp} from "@/services/go/ermcp/finance-review/interface";
-import {kxtypeName} from "@/views/manage/finance-review/setup";
-import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";
+import { QryBussinessKxRsp } from '@/services/go/ermcp/finance-review/interface';
+import { kxtypeName } from '@/views/manage/finance-review/setup';
+import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'finance_review_funds_detail',
@@ -100,8 +98,7 @@ export default defineComponent({
         function submit() {
             loading.value = true;
             context.emit('refresh');
-            cancel()
-
+            cancel();
         }
         return {
             visible,

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -8,87 +8,85 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="cancel">关闭
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="pass">审核通过
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="refuse">审核拒绝
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="pass">审核通过
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="refuse">审核拒绝
+      </a-button>
     </template>
-      <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">{{ formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="点价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="发票金额">
-                          <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</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.invoiceamount) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记时间">
-                          <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </fieldset>
-      </a-form>
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="发票金额">
+              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</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.invoiceamount) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -99,14 +97,14 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {QryBussinessFpRsp} from "@/services/go/ermcp/finance-review/interface";
-import {invoiceStatusName} from "@/views/manage/finance-review/setup";
-import {getPriceTypeName} from "@/views/information/spot-contract/setup";
-import {Modal} from "ant-design-vue";
-import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
-import Long from "long";
-import {somePriceControl} from "@/views/manage/business-review/components/setup";
-import {financeControl} from "@/views/manage/finance-review/components/setup";
+import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
+import { invoiceStatusName } from '@/views/manage/finance-review/setup';
+import { getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { Modal } from 'ant-design-vue';
+import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import Long from 'long';
+import { somePriceControl } from '@/views/manage/business-review/components/setup';
+import { financeControl } from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_audit',
@@ -138,15 +136,13 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 2,
-                    }
+                    };
                     financeControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -154,7 +150,7 @@ export default defineComponent({
             });
         }
         // 审核拒绝
-        function refuse(){
+        function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
                 okText: '确认审核拒绝',
@@ -163,15 +159,13 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 3,
-                    }
+                    };
                     financeControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/finance-review/components/invoiceCancel/index.vue

@@ -8,83 +8,81 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="submit">关闭
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">关闭
+      </a-button>
 
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="back">撤销
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="back">撤销
+      </a-button>
     </template>
-      <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">{{ formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="点价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="发票金额">
-                          <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</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.invoiceamount) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记时间">
-                          <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-          </fieldset>
-      </a-form>
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="点价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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">{{ invoiceStatusName(selectedRow.contracttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="发票金额">
+              <span class="white">{{ formatValue(selectedRow.invoiceamount) }}</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.invoiceamount) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
   </a-modal>
 </template>
 
@@ -95,14 +93,14 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {QryBussinessFpRsp} from "@/services/go/ermcp/finance-review/interface";
-import {invoiceStatusName} from "@/views/manage/finance-review/setup";
-import {getPriceTypeName} from "@/views/information/spot-contract/setup";
-import {Modal} from "ant-design-vue";
-import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
-import Long from "long";
-import {somePriceControl} from "@/views/manage/business-review/components/setup";
-import {financeControl} from "@/views/manage/finance-review/components/setup";
+import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
+import { invoiceStatusName } from '@/views/manage/finance-review/setup';
+import { getPriceTypeName } from '@/views/information/spot-contract/setup';
+import { Modal } from 'ant-design-vue';
+import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import Long from 'long';
+import { somePriceControl } from '@/views/manage/business-review/components/setup';
+import { financeControl } from '@/views/manage/finance-review/components/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_cancel',
@@ -117,10 +115,8 @@ export default defineComponent({
         const { visible, cancel } = closeModal('finance_review_invoice_cancel');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
-        function submit() {
-
-        }
-        function back(){
+        function submit() {}
+        function back() {
             Modal.confirm({
                 title: '是否确认撤销',
                 okText: '确认撤销',
@@ -129,15 +125,13 @@ export default defineComponent({
                     const param: ContractOperateApplyReq = {
                         OperateApplyID: Long.fromString(props.selectedRow.operateapplyid),
                         OperateType: 4,
-                    }
+                    };
                     financeControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -8,142 +8,141 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="cancel">关闭
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="pass">审核通过
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="refuse">审核拒绝
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="pass">审核通过
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="refuse">审核拒绝
+      </a-button>
     </template>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
-          <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
-              <legend>合同基本信息</legend>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="合同编号">
-                            <span class="white">{{
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet"
+                v-if="isShowContractInfo(selectedRow.inouttype)">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{
                                     getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno)
                                 }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="定价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同签署量">
-                          <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="品类">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="入库仓库">
-                          <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="入库数量">
-                            <span class="white">{{
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="入库仓库">
+              <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid)
                                 }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记时间">
-                          <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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>
 
@@ -154,19 +153,19 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {Ermcp3AreaStockApply} from "@/services/go/ermcp/inventory-review/interface";
-import {InOutTypeName, isShowContractInfo} from "@/views/manage/inventory-review/setup";
-import {getContractTypeName} from "@/views/information/spot-contract/setup";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {getGoodsUnit} from "@/views/information/goods/setup";
-import {getApplyStatusName} from "@/views/manage/business-review/setup";
-import {Modal} from "ant-design-vue";
-import {AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq} from "@/services/proto/warehouse/interface";
-import Long from "long";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {LongType} from "@/services/socket/login/interface";
-import {passStockControl, refuseStockControl} from "@/views/manage/inventory-review/components/setup";
-import moment from "moment";
+import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
+import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { Modal } from 'ant-design-vue';
+import { AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
+import Long from 'long';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { LongType } from '@/services/socket/login/interface';
+import { passStockControl, refuseStockControl } from '@/views/manage/inventory-review/components/setup';
+import moment from 'moment';
 
 export default defineComponent({
     name: 'inventory_review_checkin_audit',
@@ -198,17 +197,15 @@ export default defineComponent({
                 onOk() {
                     const param: AreaInOutApplyAuditPassReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid),
-                        AuditID:  Long.fromString( (getLongTypeLoginID() as LongType).toString()),
+                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()),
                         Remark: '',
-                    }
+                    };
                     passStockControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -216,7 +213,7 @@ export default defineComponent({
             });
         }
         // 审核拒绝
-        function refuse(){
+        function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
                 okText: '确认审核拒绝',
@@ -224,19 +221,17 @@ export default defineComponent({
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: Long.fromString( (getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 3, // int32 审核状态:3-审核拒绝 5-已撤回
-                    }
-                    refuseStockControl(param,  loading)
-                        .then(res => {
+                    };
+                    refuseStockControl(param, loading)
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/inventory-review/components/checkinCancel/index.vue

@@ -8,138 +8,137 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="submit">关闭
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">关闭
+      </a-button>
 
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="back">撤销
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="back">撤销
+      </a-button>
     </template>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
-          <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
-              <legend>合同基本信息</legend>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="合同编号">
-                            <span class="white">{{
+    <a-form class="inlineForm">
+      <fieldset class="formFieldSet"
+                v-if="isShowContractInfo(selectedRow.inouttype)">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{
                                     getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno)
                                 }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="定价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同签署量">
-                          <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="品类">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="入库仓库">
-                          <span class="white">{{ formatValue(selectedRow.warehousename) }}</span>
-                      </a-form-item>
-                  </a-col>
-              </a-row>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="入库数量">
-                            <span class="white">{{
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="入库仓库">
+              <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid)
                                 }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记时间">
-                          <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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>
 
@@ -150,19 +149,19 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {Ermcp3AreaStockApply} from "@/services/go/ermcp/inventory-review/interface";
-import {InOutTypeName, isShowContractInfo} from "@/views/manage/inventory-review/setup";
-import {getContractTypeName} from "@/views/information/spot-contract/setup";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {getGoodsUnit} from "@/views/information/goods/setup";
-import {getApplyStatusName} from "@/views/manage/business-review/setup";
-import {Modal} from "ant-design-vue";
-import {AuditERMCPAreaInOutStockApplyReq} from "@/services/proto/warehouse/interface";
-import Long from "long";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {LongType} from "@/services/socket/login/interface";
-import moment from "moment";
-import {refuseStockControl} from "@/views/manage/inventory-review/components/setup";
+import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
+import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { Modal } from 'ant-design-vue';
+import { AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
+import Long from 'long';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { LongType } from '@/services/socket/login/interface';
+import moment from 'moment';
+import { refuseStockControl } from '@/views/manage/inventory-review/components/setup';
 
 export default defineComponent({
     name: 'inventory_review_checkin_cancel',
@@ -192,15 +191,13 @@ export default defineComponent({
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回
-                    }
+                    };
                     refuseStockControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -8,138 +8,137 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="cancel">关闭
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="pass">审核通过
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="refuse">审核拒绝
-        </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">关闭
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="pass">审核通过
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="refuse">审核拒绝
+      </a-button>
     </template>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
-          <fieldset class="formFieldSet" v-if = "isShowContractInfo(selectedRow.inouttype)" >
-              <legend>合同基本信息</legend>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="合同编号">
-                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="定价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同签署量">
-                          <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="品类">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="入库仓库">
-                          <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记时间">
-                          <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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-form class="inlineForm">
+      <fieldset class="formFieldSet"
+                v-if="isShowContractInfo(selectedRow.inouttype)">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="入库仓库">
+              <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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>
 
@@ -148,19 +147,19 @@ import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {InOutTypeName, isShowContractInfo} from "@/views/manage/inventory-review/setup";
-import {getContractTypeName} from "@/views/information/spot-contract/setup";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {getGoodsUnit} from "@/views/information/goods/setup";
-import {getApplyStatusName} from "@/views/manage/business-review/setup";
-import {Ermcp3AreaStockApply} from "@/services/go/ermcp/inventory-review/interface";
-import {Modal} from "ant-design-vue";
-import Long from "long";
-import {passStockControl, refuseStockControl} from "@/views/manage/inventory-review/components/setup";
-import {AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq} from "@/services/proto/warehouse/interface";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import moment from "moment";
-import {LongType} from "@/services/socket/login/interface";
+import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
+import { Modal } from 'ant-design-vue';
+import Long from 'long';
+import { passStockControl, refuseStockControl } from '@/views/manage/inventory-review/components/setup';
+import { AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import moment from 'moment';
+import { LongType } from '@/services/socket/login/interface';
 
 export default defineComponent({
     name: 'inventory_review_checkout_audit',
@@ -192,17 +191,15 @@ export default defineComponent({
                 onOk() {
                     const param: AreaInOutApplyAuditPassReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid),
-                        AuditID:  Long.fromString( (getLongTypeLoginID() as LongType).toString()),
+                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()),
                         Remark: '',
-                    }
+                    };
                     passStockControl(param, loading)
-                        .then(res => {
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -210,7 +207,7 @@ export default defineComponent({
             });
         }
         // 审核拒绝
-        function refuse(){
+        function refuse() {
             Modal.confirm({
                 title: '是否确认审核拒绝',
                 okText: '确认审核拒绝',
@@ -218,19 +215,17 @@ export default defineComponent({
                 onOk() {
                     const param: AuditERMCPAreaInOutStockApplyReq = {
                         InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-                        AuditID: Long.fromString( (getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
                         AuditRemark: '', // string 审核备注
                         AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
                         ApplyStatus: 3, // int32 审核状态:3-审核拒绝 5-已撤回
-                    }
-                    refuseStockControl(param,  loading)
-                        .then(res => {
+                    };
+                    refuseStockControl(param, loading)
+                        .then((res) => {
                             context.emit('refresh');
-                            cancel()
-                        })
-                        .catch(err => {
-
+                            cancel();
                         })
+                        .catch((err) => {});
                 },
                 onCancel() {
                     console.log('Cancel');

src/views/manage/inventory-review/components/checkoutDetail/index.vue

@@ -13,122 +13,121 @@
                 :loading="loading"
                 @click="submit">关闭</a-button>
     </template>
-      <a-form class="inlineForm"
-              :form="form"
-              @submit="handleSearch">
-          <fieldset class="formFieldSet" v-if = "isShowContractInfo(selectedRow.inouttype)" >
-              <legend>合同基本信息</legend>
-              <a-row :gutter="24">
-                  <a-col :span="12">
-                      <a-form-item label="合同编号">
-                          <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="定价类型">
-                          <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="现货品种">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="合同签署量">
-                          <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="品类">
-                          <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="入库仓库">
-                          <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="登记时间">
-                          <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                      </a-form-item>
-                  </a-col>
-                  <a-col :span="12">
-                      <a-form-item label="状态">
-                          <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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-form class="inlineForm">
+      <fieldset class="formFieldSet"
+                v-if="isShowContractInfo(selectedRow.inouttype)">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{ getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.contractqty) }}</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">{{ InOutTypeName(selectedRow.inouttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="入库仓库">
+              <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</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.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>
 
@@ -139,11 +138,11 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
 import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
-import {Ermcp3AreaStockApply} from "@/services/go/ermcp/inventory-review/interface";
-import {InOutTypeName, isShowContractInfo} from "@/views/manage/inventory-review/setup";
-import {getApplyStatusName} from "@/views/manage/business-review/setup";
-import {getGoodsUnit} from "@/views/information/goods/setup";
-import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";
+import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
+import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
+import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
     name: 'finance_review_invoice_detail',