xxxx

src/packages/pc/views/footer/goods/order/cancel/index.vue

@@ -33,11 +33,10 @@ const onCancel = (isRefresh = false) => {
 }
 
 const onCancelSumit = () => {
-    const { wrtradeorderid, buyorsell, marketid} = props.selectedRow
+    const { orderid, marketid} = props.selectedRow
     ///  参数信息
     formData.Header = { MarketID: marketid }
-    formData.OldWRTradeOrderID = wrtradeorderid
-    formData.BuyOrSell = buyorsell
+    formData.OldOrderId = orderid
     /// 提交
     cancelSubmit().then(() => {
         ElMessage.success('提交成功')

src/packages/pc/views/footer/goods/position/components/delivery/index.vue

@@ -32,7 +32,7 @@
                 </template>
             </el-form-item>
             <el-form-item prop="DeliveryLot" label="交收数量">
-                <el-input-number placeholder="请输入数量" v-model="formData.DeliveryLot" :max="selectedRow.enableqty" min="0" />
+                <el-input-number placeholder="请输入数量" v-model="formData.DeliveryLot" :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
             <el-form-item prop="DeliveryInfo" label="交收信息">
                 <el-input placeholder="请输入交收信息" v-model="formData.DeliveryInfo" />

src/packages/pc/views/footer/goods/position/components/transfer/index.vue

@@ -30,7 +30,7 @@
                 </template>
             </el-form-item>
             <el-form-item prop="OrderQty" label="转让数量">
-                <el-input-number placeholder="请输入数量" v-model="formData.OrderQty" :max="selectedRow.enableqty" min="0" />
+                <el-input-number placeholder="请输入数量" v-model="formData.OrderQty" :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
             <el-form-item prop="OrderPrice" label="转让价格">
                 <el-input-number placeholder="请输入价格" v-model="formData.OrderPrice" :decimal-length="selectedRow.decimalplace" />
@@ -38,7 +38,7 @@
         </el-form>
         <template #footer>
             <el-button type="primary" @click="onCloseSumit">提交</el-button>
-            <el-button type="danger" @click="onCancel(false)">取消</el-button>
+            <el-button type="info" @click="onCancel(false)">取消</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/footer/performance/buy/index.vue

@@ -20,11 +20,11 @@
         <!-- 展开行 -->
         <template #expand="{ row }">
             <div class="buttonbar">
-                <el-button type="danger" size="small" @click="showComponent('manual', row)">手动确认</el-button>
+                <el-button type="danger" size="small" v-if="row.buyorsell===row.executeside-1" @click="showComponent('manual', row)">手动确认</el-button>
+                <el-button type="warning" size="small" v-if="row.buyorsell===row.executeside-1" @click="showComponent('delay', row)">延期</el-button>
+                <el-button type="primary" size="small" v-if="![6, 7].includes(row.performancestatus)" @click="showComponent('contracted', row)">违约</el-button>
+                <el-button type="info" v-if="![6, 7].includes(row.performancestatus)" size="small" @click="showComponent('edit', row)">修改</el-button>
                 <el-button type="success" size="small" @click="showComponent('details', row)">详细</el-button>
-                <el-button type="primary" size="small" @click="showComponent('contracted', row)">违约</el-button>
-                <el-button type="warning" size="small" @click="showComponent('delay', row)">延期</el-button>
-                <el-button type="info" size="small" @click="showComponent('edit', row)">修改</el-button>
             </div>
         </template>
     </app-table>

src/packages/pc/views/footer/performance/components/edit/index.vue

@@ -1,7 +1,7 @@
 <!-- 订单管理-我的履约-修改联络信息 -->
 <template>
-    <app-drawer title="修改联络信息" :width="512" v-model:show="show" :loading="loading" :refresh="refresh">
-        <el-form ref="formRef" label-width="80px" :model="formData" :rules="formRules">
+    <app-drawer title="修改联络信息" width="80%" v-model:show="show" :loading="loading" :refresh="refresh">
+        <el-form ref="formRef" class="el-form--horizontal" label-width="80px" :model="formData" :rules="formRules">
             <el-form-item label="履约计划">
                 <span>{{ handleNoneValue(selectedRow.curstepid) }}</span>
             </el-form-item>
@@ -48,7 +48,7 @@
             </template>
         </el-form>
         <template #footer>
-            <el-button @click="onCancel(false)" plain>取消</el-button>
+            <el-button type="info" @click="onCancel(false)" plain>取消</el-button>
             <el-button type="primary" @click="onSubmit">确认</el-button>
         </template>
     </app-drawer>

src/packages/pc/views/footer/performance/components/manual/index.vue

@@ -46,6 +46,7 @@ const onCancel = (isRefresh = false) => {
 }
 
 const onSubmit = () => {
+    confirmFormData.value.PerformancePlanStepID = props.selectedRow.performanceplanid
     formRef.value?.validate((valid) => {
         if (valid) {
             confirmSubmit().then(() => {

src/packages/pc/views/footer/performance/sell/index.vue

@@ -20,11 +20,11 @@
         <!-- 展开行 -->
         <template #expand="{ row }">
             <div class="buttonbar">
-                <el-button type="danger" size="small" @click="showComponent('manual', row)">手动确认</el-button>
+                <el-button type="danger" size="small" v-if="row.buyorsell===row.executeside-1" @click="showComponent('manual', row)">手动确认</el-button>
+                <el-button type="warning" size="small" v-if="row.buyorsell===row.executeside-1" @click="showComponent('delay', row)">延期</el-button>
+                <el-button type="primary" size="small" v-if="![6, 7].includes(row.performancestatus)" @click="showComponent('contracted', row)">违约</el-button>
+                <el-button type="info" v-if="![6, 7].includes(row.performancestatus)" size="small" @click="showComponent('edit', row)">修改</el-button>
                 <el-button type="success" size="small" @click="showComponent('details', row)">详细</el-button>
-                <el-button type="primary" size="small" @click="showComponent('contracted', row)">违约</el-button>
-                <el-button type="warning" size="small" @click="showComponent('delay', row)">延期</el-button>
-                <el-button type="info" size="small" @click="showComponent('edit', row)">修改</el-button>
             </div>
         </template>
     </app-table>

src/packages/pc/views/footer/spot/position/components/listing/index.vue

@@ -19,7 +19,7 @@
                 <span>{{ selectedRow.enableqty }}</span>
             </el-form-item>
             <el-form-item prop="OrderQty" label="挂牌数量">
-                <el-input-number placeholder="请输入挂牌数量" v-model="formData.OrderQty" :max="selectedRow.enableqty" min="0" />
+                <el-input-number placeholder="请输入挂牌数量" v-model="formData.OrderQty" :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
             <el-form-item prop="FixedPrice" label="挂牌价格">
                 <el-input-number placeholder="请输入挂牌价格" v-model="formData.FixedPrice" />
@@ -42,10 +42,10 @@ const props = defineProps({
     selectedRow: {
         type: Object as PropType<Model.HoldLBRsp>,
         required: true
-    }
+    },
+    code: String
 })
 
-console.log(props.selectedRow)
 
 const { formData, listingSubmit, loading } = useHdWROrder()
 const show = ref(true)

src/packages/pc/views/footer/spot/position/components/pickup/index.vue

@@ -19,7 +19,7 @@
                 <span>{{selectedRow.enableqty}}</span>
             </el-form-item>
             <el-form-item prop="OrderQty" label="提货数量">
-                <el-input-number placeholder="请输入提货数量" v-model="orderQty" :max="selectedRow.enableqty" min="0" />
+                <el-input-number placeholder="请输入提货数量" v-model="orderQty" :max="selectedRow.enableqty" :min="0" />
             </el-form-item>
             <el-form-item prop="AppointmentModel" label="提货方式">
                 <el-select v-model="formData.AppointmentModel" :disabled="loading">
@@ -149,7 +149,6 @@ const addressChange = (item: Model.UserReceiveInfoRsp) => {
     formData.DistrictID = item.districtid
     formData.Address = item.address
     regionName.value = [item.provincename, item.cityname, item.districtname].join(' ')
-    formRef.value?.validate('Region')
 }
 
 

src/types/proto/trade.d.ts

@@ -613,15 +613,15 @@ declare global {
             ClientSerialNo: string; // 客户端流水号
             ClientType: number; // 终端类型
         }
-// 补充定金接口响应
-interface SupplementDepositRsp {
-	Header?: IMessageHead; // 消息头
-	optional int32 RetCode = 2; // 返回码
-	optional string RetDesc = 3; // 描述信息
-		optional uint64 TradeID = 4; // 成交单号，必填
-		optional uint32 UserID = 5; // 用户ID，必填
-		optional uint64 AccountID = 6; // 交易账号，必填
-		optional string ClientSerialNo = 7; // 客户端流水号
-}
+        // 补充定金接口响应
+        interface SupplementDepositRsp {
+            Header?: IMessageHead; // 消息头
+            RetCode: number; // 返回码
+            RetDesc: string; // 描述信息
+            TradeID: number; // 成交单号，必填
+            UserID: number; // 用户ID，必填
+            AccountID: number; // 交易账号，必填
+            ClientSerialNo: string; // 客户端流水号
+        }
     }
 }