产品上架修改接口调用

@@ -155,9 +155,9 @@ export const getContractDataProduct = (tenantGuid) => request({
 })
 })
 
 
 /** 获取下拉数据产品列表的去重字段 */
 /** 获取下拉数据产品列表的去重字段 */
-export const getDamFieldsByProductGuid = (productGuid) => request({
-  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/field-by-dam-guid?damGuid=${productGuid}`,
-  method: 'post'
+export const getDamFieldsByProductGuid = (productGuid, isTds = 'N') => request({
+  url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/field-by-dam-guid?damGuid=${productGuid}&isTds=${isTds}`,
+  method: 'get'
 })
 })
 
 
 /** 创建合约 */
 /** 创建合约 */

@@ -405,65 +405,69 @@ const tableBtnClick = (scope, btn) => {
 
 
   }
   }
   if (type == 'pass') {
   if (type == 'pass') {
-    if (getFirstNodePromise.value[row.guid]) {
-      return;
-    }
-    getFirstNodePromise.value[row.guid] = isMyFirstNode({
-      deploymentId: row.approveVO.camundaDeploymentId,
-      processInstanceId: row.approveVO.camundaInstanceId,
-      staffGuid: userData.staffGuid
-    }).then((res: any) => {
-      getFirstNodePromise.value[row.guid] = null;
-      if (res?.code == proxy.$passCode) {
-        if (res.data) {
-          approveSuggest.value = '';
-          dynamicPlaceholder.value = '请填写通过理由（选填）';
-          // if (listingFormRef.value) {
-          //   clearFormValues(listingFormRef.value.formInline);
-          //   listingFormRef.value.ruleFormRef.clearValidate(formInfo.value.items.map(item => item.field))
-          //   listingFormRef.value.ruleFormRef.resetFields(formInfo.value.items.map(item => item.field))
-          // }
-
-          approveType.value = 'pass';
-          dialogTitle.value = '通过流程'
-          dialogVisible.value = true;
-        } else {
-          passCommonDialogInfo.value.visible = true;
-        }
-      } else {
-        proxy.$ElMessage.error(res.msg);
-      }
-    })
+    // if (getFirstNodePromise.value[row.guid]) {
+    //   return;
+    // }
+    passCommonDialogInfo.value.visible = true;
+    passCommonDialogInfo.value.contents[0].formInfo.items[0].default = '';
+    // getFirstNodePromise.value[row.guid] = isMyFirstNode({
+    //   deploymentId: row.approveVO.camundaDeploymentId,
+    //   processInstanceId: row.approveVO.camundaInstanceId,
+    //   staffGuid: userData.staffGuid
+    // }).then((res: any) => {
+    //   getFirstNodePromise.value[row.guid] = null;
+    //   if (res?.code == proxy.$passCode) {
+    //     if (res.data) {
+    //       approveSuggest.value = '';
+    //       dynamicPlaceholder.value = '请填写通过理由（选填）';
+    //       // if (listingFormRef.value) {
+    //       //   clearFormValues(listingFormRef.value.formInline);
+    //       //   listingFormRef.value.ruleFormRef.clearValidate(formInfo.value.items.map(item => item.field))
+    //       //   listingFormRef.value.ruleFormRef.resetFields(formInfo.value.items.map(item => item.field))
+    //       // }
+
+    //       approveType.value = 'pass';
+    //       dialogTitle.value = '通过流程'
+    //       dialogVisible.value = true;
+    //     } else {
+    //       passCommonDialogInfo.value.visible = true;
+    //     }
+    //   } else {
+    //     proxy.$ElMessage.error(res.msg);
+    //   }
+    // })
   }
   }
   if (type == 'reject') {
   if (type == 'reject') {
-    if (getFirstNodePromise1.value[row.guid]) {
-      return;
-    }
-    getFirstNodePromise1.value[row.guid] = isMyFirstNode({
-      deploymentId: row.approveVO.camundaDeploymentId,
-      processInstanceId: row.approveVO.camundaInstanceId,
-      staffGuid: userData.staffGuid
-    }).then((res: any) => {
-      getFirstNodePromise1.value[row.guid] = null;
-      if (res?.code == proxy.$passCode) {
-        if (res.data) {
-          approveSuggest.value = '';
-          dynamicPlaceholder.value = '请填写驳回理由（必填）';
-          // if (listingFormRef.value) {
-          //   clearFormValues(listingFormRef.value.formInline);
-          //   listingFormRef.value.ruleFormRef.clearValidate(formInfo.value.items.map(item => item.field))
-          //   listingFormRef.value.ruleFormRef.resetFields(formInfo.value.items.map(item => item.field))
-          // }
-          approveType.value = 'reject';
-          dialogTitle.value = '驳回流程'
-          dialogVisible.value = true;
-        } else {
-          rejectDialogInfo.value.visible = true;
-        }
-      } else {
-        proxy.$ElMessage.error(res.msg);
-      }
-    })
+    rejectDialogInfo.value.visible = true;
+    rejectDialogInfo.value.contents[0].formInfo.items[0].default = '';
+    // if (getFirstNodePromise1.value[row.guid]) {
+    //   return;
+    // }
+    // getFirstNodePromise1.value[row.guid] = isMyFirstNode({
+    //   deploymentId: row.approveVO.camundaDeploymentId,
+    //   processInstanceId: row.approveVO.camundaInstanceId,
+    //   staffGuid: userData.staffGuid
+    // }).then((res: any) => {
+    //   getFirstNodePromise1.value[row.guid] = null;
+    //   if (res?.code == proxy.$passCode) {
+    //     if (res.data) {
+    //       approveSuggest.value = '';
+    //       dynamicPlaceholder.value = '请填写驳回理由（必填）';
+    //       // if (listingFormRef.value) {
+    //       //   clearFormValues(listingFormRef.value.formInline);
+    //       //   listingFormRef.value.ruleFormRef.clearValidate(formInfo.value.items.map(item => item.field))
+    //       //   listingFormRef.value.ruleFormRef.resetFields(formInfo.value.items.map(item => item.field))
+    //       // }
+    //       approveType.value = 'reject';
+    //       dialogTitle.value = '驳回流程'
+    //       dialogVisible.value = true;
+    //     } else {
+    //       rejectDialogInfo.value.visible = true;
+    //     }
+    //   } else {
+    //     proxy.$ElMessage.error(res.msg);
+    //   }
+    // })
   }
   }
   if (type == 'up') {
   if (type == 'up') {
     if (row.exchangeGuid) {
     if (row.exchangeGuid) {
@@ -662,6 +666,7 @@ const passCommonDialogInfo = ref({
             field: "approveSuggest",
             field: "approveSuggest",
             clearable: true,
             clearable: true,
             maxlength: 400,
             maxlength: 400,
+            default: '',
             block: true,
             block: true,
             col: 'margin_b_0',
             col: 'margin_b_0',
           }
           }
@@ -725,6 +730,7 @@ const rejectDialogInfo = ref({
             type: "textarea",
             type: "textarea",
             placeholder: "请填写驳回理由（必填）",
             placeholder: "请填写驳回理由（必填）",
             field: "approveSuggest",
             field: "approveSuggest",
+            default: '',
             clearable: true,
             clearable: true,
             block: true,
             block: true,
             col: 'margin_b_0',
             col: 'margin_b_0',