优化

.env.development

@@ -6,7 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 # 李陈杰 209
-VITE_APP_BASE_API = 'http://192.168.110.188:8899'
+VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成

src/views/biddingManagemen/biddingLimit/index.vue

@@ -165,7 +165,8 @@ const getTableData = async () => {
   loading.value = true;
   const params = {
     projectId: currentProject.value?.id,
-    sheet: queryForm.value.sheet
+    sheet: queryForm.value.sheet,
+    versions: queryForm.value.versions
   };
   const res = await getTreeLimit(params);
   loading.value = false;

src/views/contract/division/index.vue

@@ -165,7 +165,7 @@
       </el-row>
       <template #footer>
         <el-button @click="closeDialog">取消</el-button>
-        <el-button type="primary" @click="submitForm(formRef)">确定</el-button>
+        <el-button type="primary" @click="submitForm(formRef)" :loading="loadingBtn">确定</el-button>
       </template>
     </el-dialog>
     <el-dialog title="详情" v-model="detailDialog" width="75%" draggable>
@@ -228,7 +228,7 @@ const rules = ref({
   content: [{ required: true, message: '请输入内容', trigger: 'blur' }]
 });
 const loading = ref(false);
-
+const loadingBtn = ref();
 //字典获取数据
 const getTabsList = async () => {
   const res = await getDicts('subcontracting_type');
@@ -457,6 +457,7 @@ const submitForm = async (formEl: FormInstance | undefined) => {
           });
           return;
         }
+        loadingBtn.value = true;
         const newSelectionData = selectionData.value.filter((item) => item.quantity != '' && item.quantity != null);
         if (newSelectionData.some((item) => item.selectNum == '' || item.selectNum == null)) {
           ElMessage.error('存在未填写数量的工程或费用名称，请检查');
@@ -488,6 +489,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         }
       } catch (error) {
         console.log(error);
+      } finally {
+        loadingBtn.value = false;
       }
     } else {
       console.log('error submit!', fields);
@@ -544,7 +547,7 @@ const handleDetail = (row: any) => {
   getDetails(row);
 };
 const getDetails = (row: any) => {
-  getDetailsList({ id: row.id, type: '1' }).then((res) => {
+  getDetailsList({ id: row.id, type: '1', projectId: currentProject.value?.id }).then((res) => {
     if (res.code == 200) {
       detailData.value = res.data;
     }

src/views/ctr/index.vue

@@ -67,7 +67,7 @@
             <el-form-item label="招标计划" prop="tenderId">
               <!-- <el-input v-model="form.tenderId" placeholder="请输入招标Id" /> -->
               <el-input v-model="form.name" placeholder="请选择招标计划" disabled />
-              <el-button type="primary" @click="handleChoose">选择招标</el-button>
+              <el-button type="primary" @click="handleChoose" v-hasPermi="['ctr:expensesContract:tenderList']">选择招标</el-button>
             </el-form-item>
             <el-form-item label="供应商" prop="contractSupplier">
               <el-input v-model="form.contractSupplier" placeholder="请输入供应商" disabled />
@@ -313,7 +313,7 @@ const submitForm = async () => {
       }
       resetForm();
       ElMessage.success('合同提交成功');
-      // active.value = 0; // 重置步骤
+      active.value = 0; // 重置步骤
       if (contract_type.value === 'income') {
         proxy.$router.push('/ctr/incomeContract');
       } else {

src/views/tender/plan/comm/winTheBid.vue

@@ -6,7 +6,7 @@
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="招标文件" prop="name">
+      <el-form-item label="中标文件" prop="name">
         <file-upload
           v-model="form.costEstimationFile"
           :fileSize="100"

src/views/tender/plan/index.vue

@@ -665,7 +665,7 @@ const handleDetail = (row: any) => {
   getDetails(row);
 };
 const getDetails = (row: any) => {
-  getTenderPlanDetail({ id: row.id }).then((res) => {
+  getTenderPlanDetail({ id: row.id, projectId: currentProject.value?.id }).then((res) => {
     if (res.code == 200) {
       detailData.value = res.data;
     }