Fixed bug.

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

@@ -84,7 +84,7 @@
             <a-input-number class="dialogInput"
                             style="width: 200px"
                             :min="0"
-                            max="99999999999"
+                            :max="99999999999"
                             v-model:value="formState.PlanQty"
                             placeholder="请输入计划量"></a-input-number>
           </a-form-item>

src/views/business/plan/components/interface.ts

@@ -1,5 +1,5 @@
 export interface FormState {
-    // HedgePlanID: number // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
+    HedgePlanID?: number // uint64 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
     HedgePlanNo: string // string 套保计划名称
     ContractType: number | undefined// int32 计划类型-1:采购-1:销售
     // AreaUserID?: number// uint64 机构ID

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

@@ -40,7 +40,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="计划量" class="relative" name="PlanQty">
-            <a-input class="dialogInput" style="width: 200px" v-model:value="formState.PlanQty" placeholder="请输入计划量" />
+            <a-input-number class="dialogInput" style="width: 200px" v-model:value="formState.PlanQty" placeholder="请输入计划量" />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -117,9 +117,10 @@ export default defineComponent({
                 getDG();
                 queryTable();
                 mergeTwoObj(formState, props.selectedRow);
-                const { deliverygoodsid, planqty, wrstandardid } = props.selectedRow;
+                const { deliverygoodsid, planqty, wrstandardid, hedgeplanid } = props.selectedRow;
                 deliverygoodsid && chooseMG(deliverygoodsid);
                 formState.PlanQty = planqty;
+                formState.HedgePlanID = Number(hedgeplanid);
 
                 if (wrstandardid) {
                     formState.WRStandardID = wrstandardid;
@@ -132,6 +133,7 @@ export default defineComponent({
                 const loginId = geLoginID_number();
                 const userid = getAreaUserId();
                 const reqParam: ErmcpHedgePlanReq = {
+                    HedgePlanID: param.HedgePlanID,
                     HedgePlanNo: param.HedgePlanNo, // 计划类型
                     ContractType: param.ContractType, // 计划类型
                     DeliveryGoodsID: Number(param.DeliveryGoodsID),

src/views/business/plan/components/setup.ts

@@ -13,6 +13,7 @@ import { FormState } from "./interface";
 export function handleForm() {
     const formRef = ref();
     const formState: UnwrapRef<FormState> = reactive({
+        HedgePlanID: undefined,
         HedgePlanNo: '',// string 套保计划名称
         ContractType: undefined,// int32 计划类型-1:采购-1:销售
         DeliveryGoodsID: undefined,// uint64 现货品种ID

src/views/business/search/spot/index.vue

@@ -20,6 +20,7 @@ import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { useRoute } from 'vue-router';
+import moment from 'moment';
 
 export default defineComponent({
     name: 'spot-contract-search',
@@ -36,7 +37,16 @@ export default defineComponent({
         const queryTableAction = () => {
             switch (routeName) {
                 case 'search_purchase':
-                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '3,4' });
+                    queryTable(QuerySpotContract, { contracttype: 1, querytype: '3,4' }).then(res => {
+                        // FIXME: - 这里有覆盖先后顺序的问题
+                        tableList.value = []
+                        tableList.value = res.sort((a,b) => {
+                            if (a.contracctstatus !== b.contracctstatus) {
+                                return a.contracctstatus - b.contracctstatus
+                            }
+                            return moment(b.createtime).valueOf() - moment(a.createtime).valueOf()
+                        })
+                    });
                     break;
                 case 'search_sell':
                     queryTable(QuerySpotContract, { contracttype: -1, querytype: '3,4' });

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

@@ -50,7 +50,7 @@
                     </a-col>
                     <a-col :span="12">
                         <a-form-item label="详细地址">
-                            <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                            <span class="white">{{ formatValue(getProvinceName(selectedRow.provinceid) + getCityName(selectedRow.cityid) + getDistrictName(selectedRow.districtid) + selectedRow.address) }}</span>
                         </a-form-item>
                     </a-col>
                 </a-row>

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

@@ -18,6 +18,9 @@
             <template #warehousestatus="{ text }">
                 <span>{{ gerWareHouseStatusName(text) }}</span>
             </template>
+            <template #address="{ record }">
+                <span>{{ getProvinceName(record.provinceid) + getCityName(record.cityid) + getDistrictName(record.districtid) + record.address }}</span>
+            </template>
         </a-table>
         <!-- 右键 -->
         <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
@@ -36,6 +39,7 @@ import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface
 import Filter from '../../compoments/filterTable/index.vue';
 import { getTableButton } from '@/common/setup/table/button';
 import { useRoute } from 'vue-router';
+import { getAddress } from '@/services/go/adress';
 
 export default defineComponent({
     name: 'warehouse-info-normal',
@@ -93,6 +97,8 @@ export default defineComponent({
             pingan_cwarehousecolumn,
             buttons,
             addButton,
+            ...getAddress(),
+
         };
     },
 });