合同登记相关

src/components/FileUpload/index.vue

@@ -98,7 +98,7 @@ const props = defineProps({
   showFileList: propTypes.bool.def(false),
   // 默认显示的文件列表
   defaultFileList: {
-    type: Array,
+    type: Array as any,
     default: () => []
   },
   // 其他参数
@@ -180,11 +180,10 @@ watch(
   { deep: true, immediate: true }
 );
 watch(() => props.defaultFileList, () => {
-  if(props.defaultFileList.length === 0) return;
+  if (props.defaultFileList.length === 0) return;
   props.defaultFileList.forEach((item: any) => {
     fileList.value.push(item);
   });
-  console.log(fileList.value);
 
 }, { deep: true, immediate: true });
 // 上传前校检格式和大小

src/views/ctr/index.vue

@@ -14,7 +14,7 @@
 
             </template>
             <template v-else-if="active == 1">
-                <template v-if="contractType == 'income'">
+                <template v-if="contract_type == 'income'">
                     <el-form ref="incomeContractFormRef" :model="form" :rules="rules" label-width="80px">
                         <el-form-item label="项目名称">
                             <el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
@@ -22,6 +22,12 @@
                         <el-form-item label="合同编号" prop="contractCode">
                             <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
                         </el-form-item>
+                        <el-form-item label="合同类型" prop="contractType">
+                            <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                                <el-option v-for="item in income_contract_type" :key="item.value" :label="item.label"
+                                    :value="item.value" />
+                            </el-select>
+                        </el-form-item>
                         <el-form-item label="业主单位" prop="contractOwner">
                             <el-input v-model="form.contractOwner" placeholder="请输入业主单位" />
                         </el-form-item>
@@ -36,11 +42,11 @@
                         </el-form-item>
                         <el-form-item label="附件">
                             <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
-                                :ref="fileRef" :defaultFileList="fileList" />
+                                :ref="fileRef" :defaultFileList="tempFileList" />
                         </el-form-item>
                     </el-form>
                 </template>
-                <template v-else-if="contractType == 'expenses'">
+                <template v-else-if="contract_type == 'expenses'">
                     <el-form ref="expensesContractFormRef" :model="form" :rules="rules" label-width="80px">
                         <el-form-item label="项目名称">
                             <el-input :model-value="projectName" placeholder="请输入项目ID" disabled />
@@ -48,6 +54,12 @@
                         <el-form-item label="合同编号" prop="contractCode">
                             <el-input v-model="form.contractCode" placeholder="请输入合同编号" />
                         </el-form-item>
+                        <el-form-item label="合同类型" prop="contractType">
+                            <el-select v-model="form.contractType" placeholder="请选择合同类型">
+                                <el-option v-for="item in expenses_contract_type" :key="item.value" :label="item.label"
+                                    :value="item.value" />
+                            </el-select>
+                        </el-form-item>
                         <el-form-item label="供应商" prop="contractSupplier">
                             <el-input v-model="form.contractSupplier" placeholder="请输入供应商" />
                         </el-form-item>
@@ -65,12 +77,39 @@
                         </el-form-item>
                         <el-form-item label="附件">
                             <FileUpload :multiple="true" :fileType="['pdf']" :onUploadSuccess="onUploadSuccess"
-                                :ref="fileRef" :defaultFileList="fileList" />
+                                :ref="fileRef" :defaultFileList="tempFileList" />
                         </el-form-item>
                     </el-form>
                 </template>
+                <div>
+                    <el-button @click="back">上一步</el-button>
                     <el-button type="primary" @click="active++">下一步</el-button>
-
+                </div>
+            </template>
+            <template v-else-if="active == 2">
+                <el-form :model="form" :rules="rules" label-width="120">
+                    <el-form-item label="支付方式" placeholder="请选择支付方式" prop="payType">
+                        <el-select v-model="form.payType">
+                            <el-option :value="1">月结算</el-option>
+                            <el-option :value="2">形象节点</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="预付款比例" prop="advancePayRatio">
+                        <el-input v-model="form.advancePayRatio" placeholder="请输入预付款比例" />
+                    </el-form-item>
+                    <el-form-item label="尾款比例" prop="balancePayRatio">
+                        <el-input v-model="form.balancePayRatio" placeholder="请输入尾款比例" />
+                    </el-form-item>
+                    <el-form-item label="质保金比例" prop="assuranceDepositRatio;">
+                        <el-input v-model="form.assuranceDepositRatio" placeholder="请输入质保金比例" />
+                    </el-form-item>
+                    <el-form-item label="付款比例" prop="payRatio">
+                        <el-input v-model="form.payRatio" placeholder="请输入付款比例" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="success">提交</el-button>
+                    </el-form-item>
+                </el-form>
             </template>
         </div>
 
@@ -79,13 +118,21 @@
 <script setup>
 import FileUpload from '@/components/FileUpload';
 const active = ref(0);
-const contractType = ref("")
+const contract_type = ref("")
-const form = ref({})
+const form = ref({ payType: 1 })
 const fileList = ref([])
+const tempFileList = ref([])
+const { proxy } = getCurrentInstance();
+
+const { expenses_contract_type, income_contract_type } = toRefs(
+    proxy?.useDict('income_contract_type', 'expenses_contract_type')
+);
+console.log(income_contract_type);
+
 const checkContractType = (type) => {
-    contractType.value = type;
+    contract_type.value = type;
-    form.value.contractType = type;
+    form.value.contract_type = type;
-    active.value++;
+    active.value = 1;
     form.value.step = active.value;
 
 };
@@ -93,9 +140,12 @@ const projectName = computed(() => {
     return JSON.parse(localStorage.getItem("selectedProject"))['name']
 });
 const onUploadSuccess = (data) => {
+    console.log(data);
+
     data.forEach(item => {
         // const { name: fileName, url: fileUrl, ossId } = item;
         // fileList.value.push({ fileName, fileUrl, ossId, contractType: contractType.value });
+
         fileList.value.push(item);
 
     });
@@ -118,10 +168,12 @@ onMounted(() => {
             const t = JSON.parse(tempForm);
             const { fileList: files, ...rest } = JSON.parse(tempForm);
             form.value = rest;
+            console.log(form.value);
+
             fileList.value = files || [];
-            contractType.value = form.value.contractType;
+            tempFileList.value = files || [];
+            contract_type.value = form.value.contract_type;
             active.value = 1;
-            console.log(fileList.value);
 
         }).catch(() => {
             localStorage.removeItem("tempContractForm");