合同进度一览接口联调

@@ -451,6 +451,27 @@ export const getContractList = (params) => request({
   data: params
   data: params
 })
 })
 
 
+/** 新增合同 */
+export const saveDamContract = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/save`,
+  method: 'post',
+  data: params
+}) 
+
+/** 更新合同 */
+export const updateDamContract = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/update`,
+  method: 'put',
+  data: params
+}) 
+
+/** 删除合同 */
+export const delDamContract =  (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-contract/delete`,
+  method: 'delete',
+  data: params
+}) 
+
 /** 获取会员列表 */
 /** 获取会员列表 */
 export const getTenantList = (params) => request({
 export const getTenantList = (params) => request({
   url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/singlePage`,
   url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/singlePage`,
@@ -458,12 +479,6 @@ export const getTenantList = (params) => request({
   data: params
   data: params
 })
 })
 
 
-/** 获取当前用户所在的企业 */
-export const getOwnerTenantList = (userGuid) => request({
-  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/get-tenant-by-user?userGuid=${userGuid}`,
-  method: 'get'
-})
-
 // API详情
 // API详情
 /** 查询域名和文根 */
 /** 查询域名和文根 */
 /** api类型,有表单类型,自定义sql. */
 /** api类型,有表单类型,自定义sql. */

@@ -106,7 +106,7 @@ const getDrawerConRef = (refName) => {
   }
   }
   //  const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
   //  const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
   if (refName == 'drawerFormRef') {
   if (refName == 'drawerFormRef') {
-    const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
+    const drawerForm = drawerFormRef.value?.[0] || drawerFormRef.value;
     return drawerForm
     return drawerForm
   }
   }
 }
 }
@@ -153,11 +153,13 @@ const tableBtnClick = (scope, btn) => {
 const submitForm = async (formEl: FormInstance | undefined, btn) => {
 const submitForm = async (formEl: FormInstance | undefined, btn) => {
   if (!formEl) return;
   if (!formEl) return;
   await formEl.validate((valid, fields) => {
   await formEl.validate((valid, fields) => {
+    const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
     if (valid) {
     if (valid) {
-      const drawerForm = drawerFormRef.value[0] || drawerFormRef.value;
       const formInfo = drawerForm.formInline;
       const formInfo = drawerForm.formInline;
       emits("drawerBtnClick", btn, formInfo);
       emits("drawerBtnClick", btn, formInfo);
     } else {
     } else {
+      var obj = fields && Object.keys(fields);
+      obj?.[0] && formEl?.scrollToField(obj?.[0])
       console.log("error submit!", fields);
       console.log("error submit!", fields);
     }
     }
   });
   });

@@ -1452,7 +1452,8 @@ const panelChange = (scope, row) => {
           :disabled="item.disabled || readonly" @change="(val) => cascaderChange(val, item)" />
           :disabled="item.disabled || readonly" @change="(val) => cascaderChange(val, item)" />
         <template v-else-if="item.type && item.type.indexOf('date') > -1">
         <template v-else-if="item.type && item.type.indexOf('date') > -1">
           <el-date-picker :class="[item.col, { is_block: item.block }]" v-if="item.type == 'date-picker'"
           <el-date-picker :class="[item.col, { is_block: item.block }]" v-if="item.type == 'date-picker'"
-            v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期"
+            v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期" :format="item.format ?? ''"
+            :value-format="item.valueFormat ?? ''"
             end-placeholder="结束日期" :unlink-panels="item.unlink ?? false" :shortcuts="item.shortcuts ?? []"
             end-placeholder="结束日期" :unlink-panels="item.unlink ?? false" :shortcuts="item.shortcuts ?? []"
             :default-value="item.defaultDate" :disabled="item.disabled ?? false" />
             :default-value="item.defaultDate" :disabled="item.disabled ?? false" />
           <el-date-picker :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'date-year'"
           <el-date-picker :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'date-year'"

@@ -182,6 +182,10 @@ onMounted(() => {
           <el-date-picker v-model="formInline[item.field]" type="datetimerange" start-placeholder="开始时间"
           <el-date-picker v-model="formInline[item.field]" type="datetimerange" start-placeholder="开始时间"
             end-placeholder="结束时间" />
             end-placeholder="结束时间" />
         </template>
         </template>
+        <template v-else-if="item.type == 'date-range'">
+          <el-date-picker v-model="formInline[item.field]" type="daterange" start-placeholder="开始日期" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
+            end-placeholder="结束日期" />
+        </template>
         <template v-else-if="item.type == 'radio-button'">
         <template v-else-if="item.type == 'radio-button'">
           <el-radio-group v-model="formInline[item.field]" @change="radioGroupChange">
           <el-radio-group v-model="formInline[item.field]" @change="radioGroupChange">
             <el-radio-button v-for="opts in item.options" :label="opts.label" />
             <el-radio-button v-for="opts in item.options" :label="opts.label" />