Merge branch 'develop' into release-test

@@ -29,7 +29,7 @@ export const getQualityInfo = (data) => request({
 
 /** 获取首页资产交易情况 */
 export const getDaTradeInfo = (params) => request({
-    url: `${import.meta.env.VITE_API_NEW_PORTAL}/da-trade/page-list`,
+    url: `${import.meta.env.VITE_API_NEW_PORTAL}/home/company/trade-info`,
     method: 'post',
     data: params
 })

@@ -1119,12 +1119,11 @@ const panelChange = (scope, row) => {
             <el-radio v-for="(radio, index) in item.options" :label="radio.value">
               <template #default>
                 <span :style="{ 'line-height': '32px' }">{{ radio.label }}</span>
-                <span
-                  :style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
+                <span :style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
                   <el-form-item
                     v-if="index == (item.inputOptions?.index ?? (item.options.length - 1)) && (item.inputOptions?.visible ?? false)"
                     :prop="item.inputOptions?.field" :class="[item.inputOptions?.col]">
-                    <el-select v-if="item.inputOptions.type == 'select'" v-model="formInline[item.inputOptions?.field]"
+                    <el-select v-if="item.inputOptions?.type == 'select'" v-model="formInline[item.inputOptions?.field]"
                       :placeholder="item.inputOptions?.placeholder" :clearable="item.inputOptions?.clearable ?? false"
                       :filterable="item.inputOptions?.filterable ?? false"
                       :disabled="item.inputOptions?.disabled || readonly"
@@ -1136,12 +1135,12 @@ const panelChange = (scope, row) => {
                         :value="item.inputOptions?.props?.value ? opts[item.inputOptions.props.value] : opts.value"
                         :disabled="opts.disabled" />
                     </el-select>
-                    <el-date-picker v-else-if="item.ipnutOptions.type == 'date'"
+                    <el-date-picker v-else-if="item.ipnutOptions?.type == 'date'"
                       :disabled="item.inputOptions?.disabled || readonly" v-model="formInline[item.inputOptions?.field]"
                       type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                       :placeholder="item.inputOptions?.placeholder"
                       :disabled-date="item.inputOptions?.disabledDate ?? ((time) => { return false; })" />
-                    <el-input v-else-if="item.inputOptions.type == 'input'"
+                      <el-input v-else-if="item.inputOptions?.type == 'input'"
                       v-model.trim="formInline[item.inputOptions?.field]" :placeholder="item.inputOptions?.placeholder"
                       :disabled="item.inputOptions?.disabled || readonly" :clearable="item.inputOptions?.clearable"
                       :maxlength="item.inputOptions?.maxlength ?? ''" />

@@ -104,6 +104,7 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
     return scope.row['ownIndustryName']?.join(',')
   }
 },
+{ label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
 {
   label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
     const approveVO = scope.row.approveVO || {}

@@ -1986,8 +1986,19 @@ onBeforeMount(() => {
         const data = res.data || {}
         let { approveVO } = data;
         draftDetailInfo.value = data;
-        deploymentId.value = approveVO?.camundaDeploymentId;
-        processInstanceId.value = approveVO?.camundaInstanceId
+        if (approveVO) {
+          deploymentId.value = approveVO.camundaDeploymentId;
+          processInstanceId.value = approveVO.camundaInstanceId;
+        } else {
+          getCamundaDeploymentId('10017', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+            if (res.code == proxy.$passCode) {
+              deploymentId.value = res.data;
+            } else {
+              ElMessage.error(res.msg);
+            }
+          })
+        }
+
         let coverageArea = '';
         let coverageAreas = [];
         let damTypeItem = baseFormItems.value.find(item => item.field == 'damType');

@@ -273,14 +273,14 @@ const tradeTableInfo = ref({
     // { label: "序号", type: "index", width: 56, align: "center" },
     {
       label: "资产名称",
-      field: "daName",
+      field: "damName",
       width: 140,
       // type: "text_btn",
       // columClass: 'text_btn',
       // value: "detail",
     },
-    { label: "交易日期", field: "tradeTime", width: 120 },
-    { label: "交易对象", field: "tradeObject", minWidth: 250 },
+    { label: "交易日期", field: "tradingTime", width: 120 },
+    { label: "交易对象", field: "buyerName", minWidth: 250 },
   ],
   data: [],
   showPage: false,
@@ -302,7 +302,7 @@ const getTradeTableData = () => {
     tradeTableInfo.value.loading1 = false;
     if (res.code == proxy.$passCode) {
       let data = res.data || {};
-      tradeTableInfo.value.data = data.records || [];
+      tradeTableInfo.value.data = data || [];
     } else {
       ElMessage.error(res.msg);
     }