huangbin 4 rokov pred
rodič
commit
899fef5c43

+ 1 - 0
src/views/order/commodity_contract/components/commodity_contract_bargain/setup.ts

@@ -5,5 +5,6 @@ export const columns = [
     { title: '数量', dataIndex: 'qty', key: 'qty', align: 'center', width: 120, slots: { customRender: 'qty' } },
     { title: '金额', dataIndex: 'transferamount', key: 'transferamount', width: 120, align: 'center', slots: { customRender: 'transferamount' } },
     { title: '状态', dataIndex: 'applystatus', key: 'applystatus', width: 120, align: 'center', slots: { customRender: 'applystatus' } },
+    { title: '关联持仓', dataIndex: 'tradeid', key: 'tradeid', width: 120, align: 'center', slots: { customRender: 'tradeid' } },
     { title: '时间', dataIndex: 'applytime', key: 'applytime', width: 120, align: 'center', slots: { customRender: 'applytime' } },
 ];

+ 2 - 2
src/views/order/commodity_contract/index.vue

@@ -14,9 +14,9 @@
         <a-radio-group class="conditionCommonRadioGroup"
                        v-model:value="bargainValue">
           <a-radio @focus="changeBargain(ApplyType.my)"
-                   :value="ApplyType.my">我的议价</a-radio>
+                   :value="ApplyType.my">我的申请</a-radio>
           <a-radio @focus="changeBargain(ApplyType.counterpart)"
-                   :value="ApplyType.counterpart">对方议价</a-radio>
+                   :value="ApplyType.counterpart">对方申请</a-radio>
         </a-radio-group>
       </div>
     </thirdMenu>