xxx

src/business/performance/index.ts

@@ -11,11 +11,11 @@ const loginStore = useLoginStore()
 const accountStore = useAccountStore()
 
 // 违约申请请求
-export function usePerformanceContractedApply(buyaccountid: number) {
+export function usePerformanceContractedApply(buyorsell: number) {
     const loading = shallowRef(false)
 
     const formData = ref<Partial<Proto.PerformanceContractedApplyReq>>({
-        BreachType: buyaccountid === accountStore.currentAccountId ? 2 : 1
+        BreachType: buyorsell+1
     })
 
     const formSubmit = async () => {

src/packages/mobile/views/order/list/components/goodsorder/detail/Index.vue

@@ -51,8 +51,9 @@ const onCancelSumit = () => {
         message: '确认要撤销吗？',
         showCancelButton: true,
     }).then(() => {
+        const { marketid, goodsid } = props.selectedRow
         /// 市场ID
-        formData.Header = { MarketID: props.selectedRow.marketid }
+        formData.Header = { MarketID: marketid, GoodsID: goodsid }
         formData.OldOrderId = props.selectedRow.orderid
 
         /// loding....

src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue

@@ -97,8 +97,8 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
         message: '确认要撤销吗？',
         showCancelButton: true,
     }).then(() => {
-
-        formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }
+        const { marketid, goodsid } = item
+        formData.Header = { MarketID: marketid, GoodsID: goodsid }
         formData.OldOrderId = item.orderid
 
         /// loding....

src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue

@@ -19,8 +19,8 @@
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>类型</span>
-                            <span>{{ getBuildTypeName(item.buildtype) }}{{ getBuyOrSellName(item.buyorsell) }}</span>
+                            <span>类型/方向</span>
+                            <span>{{ getBuildTypeName(item.buildtype) }}/{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
                             <span>成交价格</span>

src/packages/mobile/views/order/list/components/pricingorder/detail/Index.vue

@@ -46,6 +46,7 @@ const props = defineProps({
 })
 
 const onCancelSumit = () => {
+    console.log('goodsid')
     dialog({
         message: '确认要撤销吗？',
         showCancelButton: true,

src/packages/mobile/views/order/performance/Index.vue

@@ -25,7 +25,7 @@
                     <div class="g-order-list__content">
                         <ul>
                             <li>
-                                <span>时间</span>
+                                <span>日期</span>
                                 <span>{{ formatDate(item.createtime, 'YYYY-MM-DD') }}</span>
                             </li>
                             <li>
@@ -52,10 +52,10 @@
                                 <span>卖方已收</span>
                                 <span>{{ item.sellreceivedamount }}</span>
                             </li>
-                            <li>
+                            <!-- <li>
                                 <span>步骤到期日期</span>
                                 <span>{{ formatDate(item.curstepdeadline, 'YYYY-MM-DD') }}</span>
-                            </li>
+                            </li> -->
                         </ul>
                     </div>
                     <div class="g-order-list__btnbar">

src/packages/mobile/views/order/performance/components/breach/Index.vue

@@ -45,7 +45,7 @@ const props = defineProps({
     }
 })
 
-const { formData, formSubmit } = usePerformanceContractedApply(props.selectedRow.buyaccountid)
+const { formData, formSubmit } = usePerformanceContractedApply(props.selectedRow.buyorsell)
 const formRef = shallowRef<FormInstance>()
 
 const onUploadSuccess = (filePath: string) => {

src/packages/mobile/views/order/performance/components/detail/Index.css

@@ -0,0 +1,49 @@
+.planstep-info {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  align-content: center;
+  border: 0.5px solid #387BDC;
+  border-radius: 10px;
+  color: #333;
+  font-size: 0.25rem;
+  margin: 15px 10px;
+}
+.planstep-info__up,
+.planstep-info__mid,
+.planstep-info__dwn {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  align-content: center;
+  padding: 10px 0px;
+}
+.planstep-info__up :nth-child(1),
+.planstep-info__mid :nth-child(1),
+.planstep-info__dwn :nth-child(1) {
+  margin-left: 10px;
+}
+.planstep-info__up :nth-last-child(1),
+.planstep-info__mid :nth-last-child(1),
+.planstep-info__dwn :nth-last-child(1) {
+  margin-right: 10px;
+}
+.planstep-info__up {
+  color: #fff;
+  border-radius: 10px 10px 0px 0px;
+}
+.planstep-info .stepindex {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  background-color: #fff;
+  color: #666;
+  text-align: center;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+}

src/packages/mobile/views/order/performance/components/detail/Index.vue

@@ -17,7 +17,7 @@
                     <Cell title="买方已付" :value="formatDecimal(selectedRow.buypaidamount)" />
                     <Cell title="卖方已收" :value="formatDecimal(selectedRow.sellreceivedamount)" />
                     <Cell title="当前步骤" :value="handleNoneValue(selectedRow.curstepname)" />
-                    <Cell title="步骤到期时间" :value="formatDate(selectedRow.curstepdeadline)" />
+                    <!-- <Cell title="步骤到期时间" :value="formatDate(selectedRow.curstepdeadline)" /> -->
                     <Cell title="开始时间" :value="formatDate(selectedRow.starttime)" />
                     <Cell title="关联单号" :value="selectedRow.relatedorderid" />
                     <Cell title="履约单号" :value="selectedRow.performanceplanid" />
@@ -34,7 +34,7 @@
                             <p class="remaindays">{{ remaindays(item) }}</p>
                             <p class="endtime" v-if="item.stepstatus != 2">{{ handleNoneValue(item.endtime) }}</p>
                         </div>
-                        <div class="planstep-info__dwn" v-if="item.stepstatus === 1">
+                        <div class="planstep-info__dwn" v-if="[1, 4].includes(item.stepstatus)">
                             <p class="remaindays">{{ item.stepdays }}天</p>
                         </div>
                     </div>
@@ -102,7 +102,7 @@ const styles= (status: number) => {
 
 const remaindays = (item: Model.WrPerformancePlanStep) => {
     let days = ''
-    if ([2].includes(item.stepstatus)) {
+    if ([2, 4].includes(item.stepstatus)) {
         days = `剩余${item.remaindays}天`
     }
     else if ([3, 6].includes(item.stepstatus)) {

src/packages/mobile/views/order/performance/components/detail/index.less

@@ -17,7 +17,6 @@
       justify-content: space-between;
       align-items: center;
       align-content: center;
-      text-align: center;
       padding: 10px 0px;
 
       :nth-child(1){

src/packages/mobile/views/order/position/components/pricing/list/Index.vue

@@ -104,5 +104,4 @@ const onClosed = (item: Model.TradePositionRsp) => {
     router.push({ name: 'pricing-detail', query: { goodscode: item.goodscode, buyOrSell: buyOrSell, buildType: BuildType.Close } })
 }
 
-
 </script>