上传

src/views/Clue/Order/Comp/DialogOrder.vue

@@ -6,6 +6,31 @@
       </el-tab-pane>
       <el-tab-pane label="成交信息" name="orderInfo">
         <Descriptions :data="orderInfo" :schema="orderSchema" :columns="2" labelWidth="130px" />
+        <template v-if="orderInfo.signProducts && orderInfo.signProducts.length">
+          <el-divider direction="horizontal" content-position="left">成交产品</el-divider>
+          <el-table :data="orderInfo.signProducts" border stripe>
+            <el-table-column type="index" width="50" />
+            <el-table-column prop="productName" label="成交产品" />
+            <el-table-column prop="specsName" label="产品规格" />
+            <el-table-column prop="signNum" label="成交数量" />
+            <el-table-column prop="warehouseName" label="发货仓库" />
+            <el-table-column label="发货备注">
+              <template #default="scope">
+                <el-popover
+                  placement="top"
+                  width="500px"
+                  trigger="click"
+                  v-if="scope.row.warehouseName && scope.row.sendRemark"
+                >
+                  <template #reference>
+                    <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                  </template>
+                  <div v-dompurify-html="scope.row.sendRemark"></div>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
         <el-divider direction="horizontal" content-position="left">其他费用</el-divider>
         <el-table :data="orderInfo.extraPay" border stripe>
           <el-table-column type="index" width="50" />
@@ -13,6 +38,13 @@
           <el-table-column prop="extraPayMoney" label="金额" />
           <el-table-column prop="remark" label="备注" />
         </el-table>
+        <el-divider direction="horizontal" content-position="left">额外支出</el-divider>
+        <el-table :data="extraPayList" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="extraPayType" label="支出项" />
+          <el-table-column prop="extraPayMoney" label="金额" />
+          <el-table-column prop="remark" label="备注" />
+        </el-table>
       </el-tab-pane>
       <el-tab-pane label="回款记录" name="returnRecord">
         <el-table :data="returnRecordList" border stripe>
@@ -54,6 +86,7 @@ const clueInfo = ref({})
 const orderInfo = ref({})
 const returnRecordList = ref([])
 const aftersaleList = ref([])
+const extraPayList = ref([])
 
 function open(clueId, orderId) {
   try {
@@ -67,6 +100,9 @@ function open(clueId, orderId) {
       orderInfo.value = { ...data, ...data.diyParams }
       orderInfo.value.dealDate = formatDate(orderInfo.value.dealDate, 'YYYY-MM-DD HH:mm')
     })
+    OrderApi.getSignExtraPayList({ id: orderId }).then((data) => {
+      extraPayList.value = data
+    })
     getPaymentPage({ signId: orderId, pageNo: 1, pageSize: 100 }).then((data) => {
       returnRecordList.value = data.list
     })