合并

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.213:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 
 # 无人机接口地址
 

src/views/design/appointment/index.vue

@@ -510,10 +510,6 @@ const submitForm = async () => {
   try {
     // 1. 基础表单验证
     await leaveFormRef.value.validate();
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/ljj
     // 2. 提交前二次校验：「专业+人员」组合唯一性
     let hasDuplicate = false;
     const allKeys: string[] = [];
@@ -571,10 +567,6 @@ const submitForm = async () => {
         )
       ]
     };
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/ljj
     // 4. 数据处理（保持原有逻辑不变）
     const arr = [];
     userList.value.forEach((item) => {

src/views/materials/usageMaterials/material/indexSon.vue

@@ -121,14 +121,10 @@
                 <el-button size="small" type="text">查看详情</el-button>
               </template>
               <div class="space-y-2 text-sm">
-                                <p><span class="font-medium">采购备注：</span>{{ scope.row.cgRemark || '-' }}
+                <p><span class="font-medium">采购备注：</span>{{ scope.row.cgRemark || '-' }}</p>
-                                </p>
+                <p><span class="font-medium">到货备注：</span>{{ scope.row.dhRemark || '-' }}</p>
-                                <p><span class="font-medium">到货备注：</span>{{ scope.row.dhRemark || '-' }}
+                <p><span class="font-medium">供应商备注：</span>{{ scope.row.gysRemark || '-' }}</p>
-                                </p>
+                <p><span class="font-medium">结算备注：</span>{{ scope.row.jsRemark || '-' }}</p>
-                                <p><span class="font-medium">供应商备注：</span>{{ scope.row.gysRemark || '-'
-                                    }}</p>
-                                <p><span class="font-medium">结算备注：</span>{{ scope.row.jsRemark || '-' }}
-                                </p>
               </div>
             </el-popover>
           </template>
@@ -157,8 +153,15 @@
         <div class="text-gray-500 text-sm">
           共 {{ total }} 条记录，当前显示第 {{ (currentPage - 1) * pageSize + 1 }} 至 {{ Math.min(currentPage * pageSize, total) }} 条
         </div>
-        <el-dialog v-model="dialogVisible2" :title="dialogType2 === 'addSon' ? '新增采购信息' : '编辑采购信息'" :width="dialogWidth"
+        <el-dialog
-            :fullscreen="isFullscreen" :close-on-click-modal="false" :before-close="handleClose" destroy-on-close>
+          v-model="dialogVisible2"
+          :title="dialogType2 === 'addSon' ? '新增采购信息' : '编辑采购信息'"
+          :width="dialogWidth"
+          :fullscreen="isFullscreen"
+          :close-on-click-modal="false"
+          :before-close="handleClose"
+          destroy-on-close
+        >
           <!-- 表单内容 -->
           <el-form ref="formRef" :model="form" :rules="formRules" label-width="140px" class="space-y-4">
             <!-- 第一行 -->
@@ -170,8 +173,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="联系单下达时间" prop="issuanceTime">
-                            <el-date-picker v-model="form.issuanceTime" type="datetime" placeholder="选择联系单下达时间"
+                  <el-date-picker
-                                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    v-model="form.issuanceTime"
+                    type="datetime"
+                    placeholder="选择联系单下达时间"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  ></el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -185,8 +192,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="要求到货时间" prop="requireDelivery">
-                            <el-date-picker v-model="form.requireDelivery" type="datetime" placeholder="选择要求到货时间"
+                  <el-date-picker
-                                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    v-model="form.requireDelivery"
+                    type="datetime"
+                    placeholder="选择要求到货时间"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  ></el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -200,8 +211,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="计划到货时间" prop="scheduledDelivery">
-                            <el-date-picker v-model="form.scheduledDelivery" type="datetime" placeholder="选择计划到货时间"
+                  <el-date-picker
-                                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    v-model="form.scheduledDelivery"
+                    type="datetime"
+                    placeholder="选择计划到货时间"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  ></el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -215,8 +230,12 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="实际到货时间" prop="actualDelivery">
-                            <el-date-picker v-model="form.actualDelivery" type="datetime" placeholder="选择实际到货时间"
+                  <el-date-picker
-                                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    v-model="form.actualDelivery"
+                    type="datetime"
+                    placeholder="选择实际到货时间"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  ></el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -239,8 +258,12 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item label="验收移交时间" prop="acceptanceCheck">
-                            <el-date-picker v-model="form.acceptanceCheck" type="datetime" placeholder="选择验收移交时间"
+                  <el-date-picker
-                                value-format="YYYY-MM-DD HH:mm:ss"></el-date-picker>
+                    v-model="form.acceptanceCheck"
+                    type="datetime"
+                    placeholder="选择验收移交时间"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                  ></el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -318,8 +341,7 @@
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-form-item label="到货要求" prop="deliveryRequirements">
-                            <el-input v-model="form.deliveryRequirements" placeholder="请输入到货要求" type="textarea"
+                  <el-input v-model="form.deliveryRequirements" placeholder="请输入到货要求" type="textarea" rows="3"></el-input>
-                                rows="3"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -338,8 +360,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="供应商备注" prop="gysRemark">
-                            <el-input v-model="form.gysRemark" placeholder="请输入供应商备注" type="textarea"
+                  <el-input v-model="form.gysRemark" placeholder="请输入供应商备注" type="textarea" rows="4"></el-input>
-                                rows="4"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -356,18 +377,16 @@
           <!-- 底部按钮 -->
           <template #footer>
             <div class="flex justify-end gap-3">
-                    <el-button @click="handleCancel" class="transition-all duration-200">
+              <el-button @click="handleCancel" class="transition-all duration-200"> 取消 </el-button>
-                        取消
+              <el-button type="primary" @click="handleSubmit" :loading="submitLoading" class="transition-all duration-200">
-                    </el-button>
-                    <el-button type="primary" @click="handleSubmit" :loading="submitLoading"
-                        class="transition-all duration-200">
                 {{ dialogType2 === 'addSon' ? '新增' : '保存' }}
               </el-button>
             </div>
           </template>
         </el-dialog>
       </div>
-
+    </div>
+  </div>
 </template>
 <script setup>
 import { ref, reactive, onMounted, toRaw, getCurrentInstance } from 'vue';
@@ -536,14 +555,17 @@ const handleSubmit = async () => {
 };
 const materialsUsageDetails1 = () => {
   loading.value = true;
-    materialsUsageDetails({ physicalsupplyId: routeParams.value.id }).then(res => {
+  materialsUsageDetails({ physicalsupplyId: routeParams.value.id })
-        tableData.value = res.rows
+    .then((res) => {
-    }).catch(() => {
+      tableData.value = res.rows;
-        loading.value = false;
+    })
-    }).finally(() => {
+    .catch(() => {
       loading.value = false;
     })
-}
+    .finally(() => {
+      loading.value = false;
+    });
+};
 // 格式化日期
 const formatDate = (dateString) => {
   if (!dateString) return '-';