Merge branch 'master' of http://116.204.116.5:3000/zzw/cbjsxt-front-master

src/components/task/cbjsInfo.vue

@@ -228,7 +228,7 @@
   .audit-tabs .el-tabs__content {
     height: calc(100% - 60px); /* 减去标签头的高度 */
     overflow-y: auto; /* 这是最重要的设置，确保内容超出时显示滚动条 */
-    padding: 15px;
+    /* padding: 15px; */
     box-sizing: border-box;
   }
 

src/components/task/components/auditOpinion.vue

@@ -4,7 +4,7 @@
     <div class="opinion-section">
       <div class="opinion-header">
         <h3>成本审核初步意见</h3>
-        <el-button
+        <!-- <el-button
           class="ml10"
           type="primary"
           size="small"
@@ -12,7 +12,7 @@
           @click="handleSavePreliminaryOpinion"
         >
           保存
-        </el-button>
+        </el-button> -->
       </div>
 
       <el-form
@@ -91,7 +91,7 @@
     <div class="opinion-section">
       <div class="opinion-header">
         <h3>成本审核结论意见</h3>
-        <el-button
+        <!-- <el-button
           class="ml10"
           type="primary"
           size="small"
@@ -99,7 +99,7 @@
           @click="handleSaveConclusionOpinion"
         >
           保存
-        </el-button>
+        </el-button> -->
       </div>
 
       <el-form :model="conclusionOpinionForm" label-width="180px">
@@ -438,6 +438,7 @@
     display: flex;
     flex-direction: column;
     gap: 20px;
+    padding: 0;
   }
 
   .opinion-section {

src/components/task/components/costAudit.vue

@@ -67,7 +67,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-button
+      <!-- <el-button
         type="primary"
         size="small"
         :disabled="disabled"
@@ -106,7 +106,7 @@
         @click="handleSaveAudit"
       >
         保存核定数据
-      </el-button>
+      </el-button> -->
     </div>
 
     <el-table :data="costAuditData" style="width: 100%" border>
@@ -328,9 +328,9 @@
 </script>
 
 <style scoped>
-  .app-container {
+  /* .app-container {
     padding: 20px;
-  }
+  } */
 
   .audit-controls {
     margin-bottom: 20px;

src/components/task/components/extractMaterial.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="extract-material-container">
-    <div class="extract-controls">
-      <!-- <el-button type="primary" @click="handleAddExtract">添加资料</el-button> -->
-      <!-- <el-button
+    <!-- <div class="extract-controls">
+       <el-button type="primary" @click="handleAddExtract">添加资料</el-button>
+       <el-button
         type="danger"
         :disabled="selectedRows.length === 0"
         @click="handleBatchDelete"
       >
         批量删除
-      </el-button> -->
-    </div>
+      </el-button> 
+    </div> -->
 
     <el-table
       v-loading="loading"
@@ -55,7 +55,7 @@
         align="center"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column label="操作" width="180" fixed="right">
+      <!-- <el-table-column label="操作" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="primary"
@@ -74,7 +74,7 @@
             删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <el-dialog
       :visible.sync="dialogVisible"
@@ -658,9 +658,9 @@
 </script>
 
 <style scoped>
-  .extract-material-container {
+  /* .extract-material-container {
     padding: 20px;
-  }
+  } */
 
   .extract-controls {
     margin-bottom: 20px;

src/components/task/components/messageNotify.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="message-notify-container">
     <el-table style="width: 100%; margin-top: 20px" border :data="formData">
       <el-table-column prop="id" label="序号" width="120" align="center">
         <template slot-scope="scope">
@@ -107,3 +107,10 @@
     },
   }
 </script>
+
+<style scoped>
+  /* 移除最外层容器的 padding */
+  div {
+    padding: 0;
+  }
+</style>

src/components/task/components/workDraft.vue

@@ -10,7 +10,7 @@
       @ready="onEditorReady"
     />
     <!-- 工作底稿列表 -->
-    <div>
+    <!-- <div>
       <el-button
         type="primary"
         size="small"
@@ -19,7 +19,7 @@
       >
         核增核减记录
       </el-button>
-    </div>
+    </div> -->
     <el-table
       v-loading="loading"
       :data="workingPaperRecords"
@@ -48,7 +48,7 @@
         label="时间"
         width="180"
       ></el-table-column>
-      <el-table-column label="附件" width="100">
+      <el-table-column label="附件" width="150">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.attachments && scope.row.attachments.length > 0"
@@ -60,7 +60,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150">
+      <!-- <el-table-column label="操作" width="150">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -79,7 +79,7 @@
             删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <!-- 工作底稿编辑弹窗 -->
@@ -685,9 +685,9 @@
 </script>
 
 <style scoped>
-  .work-draft-container {
+  /* .work-draft-container {
     padding: 20px;
-  }
+  } */
 
   .working-paper-editor {
     margin-bottom: 20px;

src/views/costAudit/auditInfo/auditManage/auditOpinion.vue

@@ -433,6 +433,7 @@
     display: flex;
     flex-direction: column;
     gap: 20px;
+    margin-top: -20px;
   }
 
   .opinion-section {

src/views/costAudit/auditInfo/auditManage/costAudit.vue

@@ -267,9 +267,9 @@
 </script>
 
 <style scoped>
-  .app-container {
+  /* .app-container {
     padding: 20px;
-  }
+  } */
 
   .audit-controls {
     margin-bottom: 20px;

src/views/costAudit/auditInfo/auditManage/details.vue

@@ -73,6 +73,7 @@
     >
       <div class="dialog-content">
         <div class="form-item">
+          <label class="form-label">补充意见:</label>
           <el-input
             v-model="additionalParams.content"
             type="textarea"
@@ -83,7 +84,7 @@
           />
         </div>
         <div class="form-item">
-          <label class="form-label">发送方式</label>
+          <label class="form-label">发送方式:</label>
           <el-checkbox-group v-model="additionalParams.sendType">
             <el-checkbox label="site">站内消息</el-checkbox>
             <el-checkbox label="sms">短信通知</el-checkbox>
@@ -105,6 +106,7 @@
     >
       <div class="dialog-content">
         <div class="form-item">
+          <label class="form-label">中止意见:</label>
           <el-input
             v-model="additionalParams.content"
             type="textarea"
@@ -115,7 +117,7 @@
           />
         </div>
         <div class="form-item">
-          <label class="form-label">发送方式</label>
+          <label class="form-label">发送方式:</label>
           <el-checkbox-group v-model="additionalParams.sendType">
             <el-checkbox label="site">站内消息</el-checkbox>
             <el-checkbox label="sms">短信通知</el-checkbox>
@@ -137,6 +139,7 @@
     >
       <div class="dialog-content">
         <div class="form-item">
+          <label class="form-label">退回意见:</label>
           <el-input
             v-model="additionalParams.content"
             type="textarea"
@@ -147,7 +150,7 @@
           />
         </div>
         <div class="form-item">
-          <label class="form-label">发送方式</label>
+          <label class="form-label">发送方式:</label>
           <el-checkbox-group v-model="additionalParams.sendType">
             <el-checkbox label="site">站内消息</el-checkbox>
             <el-checkbox label="sms">短信通知</el-checkbox>
@@ -523,16 +526,18 @@
   }
 
   .form-item {
+    display: flex;
+    align-items: flex-start;
     margin-bottom: 20px;
   }
 
   .form-label {
     display: inline-block;
     width: 100px;
-    text-align: right;
-    margin-right: 0;
+    text-align: center;
     color: #606266;
-    vertical-align: middle;
+    vertical-align: top;
+    flex-shrink: 0;
   }
 
   .form-item .el-checkbox-group {
@@ -545,8 +550,13 @@
     vertical-align: middle;
   }
 
+  .form-item .el-input,
+  .form-item .el-textarea {
+    flex: 1;
+  }
+
   .form-item .el-input__inner {
-    width: calc(100% - 115px);
-    margin-left: 115px;
+    width: 100%;
+    margin-left: 0;
   }
 </style>

src/views/costAudit/auditInfo/auditManage/extractMaterial.vue

@@ -58,14 +58,14 @@
       <el-table-column label="操作" width="180" fixed="right">
         <template slot-scope="scope">
           <el-button
-            type="primary"
+            type="text"
             size="small"
             @click="handleEditExtract(scope.row)"
           >
             修改
           </el-button>
           <el-button
-            type="danger"
+            type="text"
             size="small"
             @click="handleDeleteExtract(scope.row)"
           >
@@ -77,79 +77,94 @@
     <el-dialog
       :visible.sync="dialogVisible"
       :title="dialogTitle"
-      width="500px"
+      width="600px"
       :close-on-click-modal="false"
       :modal="false"
       append-to-body
+      custom-class="extract-material-dialog"
     >
-      <el-form
-        ref="extractForm"
-        :model="extractForm"
-        :rules="rules"
-        label-width="100px"
-      >
-        <el-form-item label="材料名称" prop="materialName">
-          <el-input
-            v-model="extractForm.materialName"
-            placeholder="请输入材料名称"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="页数" prop="pageCount">
-          <el-input-number
-            v-model.number="extractForm.pageCount"
-            placeholder="请输入页数"
-            :min="1"
-            :step="1"
-          ></el-input-number>
-        </el-form-item>
-        <el-form-item label="序号" prop="orderNum">
-          <el-input-number
-            v-model.number="extractForm.orderNum"
-            placeholder="请输入序号"
-            :min="1"
-            :step="1"
-          ></el-input-number>
-        </el-form-item>
-        <el-form-item label="上传附件" prop="fileList">
-          <el-upload
-            class="upload-demo"
-            :action="''"
-            :http-request="handleFileUpload"
-            :on-remove="handleFileRemove"
-            :before-upload="beforeFileUpload"
-            :on-success="handleFileUploadSuccess"
-            :on-error="handleFileUploadError"
-            :on-progress="handleFileUploadProgress"
-            :file-list="extractForm.fileList"
-            :limit="1"
-            :on-exceed="handleFileExceed"
+      <div class="dialog-content">
+        <el-form
+          ref="extractForm"
+          :model="extractForm"
+          :rules="rules"
+          class="extract-form"
+          label-width="0"
+        >
+          <el-form-item
+            prop="materialName"
+            label="资料名称:"
+            class="custom-form-item"
+          >
+            <el-input
+              v-model="extractForm.materialName"
+              placeholder="请输入材料名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="pageCount" label="页数:" class="custom-form-item">
+            <el-input-number
+              v-model.number="extractForm.pageCount"
+              placeholder="请输入页数"
+              :min="1"
+              :step="1"
+            ></el-input-number>
+          </el-form-item>
+          <el-form-item prop="orderNum" label="序号:" class="custom-form-item">
+            <el-input-number
+              v-model.number="extractForm.orderNum"
+              placeholder="请输入序号"
+              :min="1"
+              :step="1"
+            ></el-input-number>
+          </el-form-item>
+          <el-form-item prop="remark" label="备注:" class="custom-form-item">
+            <el-input
+              v-model="extractForm.remark"
+              type="textarea"
+              placeholder="请输入备注"
+              :rows="4"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            prop="fileList"
+            label="上传扫描件:"
+            class="custom-form-item"
           >
-            <el-button
-              v-show="
-                !extractForm.fileList || extractForm.fileList.length === 0
-              "
-              size="small"
-              type="primary"
-            >
-              选择文件
-            </el-button>
-            <div slot="tip" class="el-upload__tip">
-              支持 pdf, doc, docx, xls, xlsx, csv 格式，单个文件不超过50MB
+            <div class="upload-wrapper">
+              <el-upload
+                class="upload-demo"
+                :action="''"
+                :http-request="handleFileUpload"
+                :on-remove="handleFileRemove"
+                :before-upload="beforeFileUpload"
+                :on-success="handleFileUploadSuccess"
+                :on-error="handleFileUploadError"
+                :on-progress="handleFileUploadProgress"
+                :file-list="extractForm.fileList"
+                :limit="1"
+                :on-exceed="handleFileExceed"
+              >
+                <el-button
+                  v-show="
+                    !extractForm.fileList || extractForm.fileList.length === 0
+                  "
+                  type="primary"
+                  size="small"
+                  class="upload-btn"
+                >
+                  选择文件
+                </el-button>
+                <div class="upload-tip">
+                  多张扫描图片请插入一个word文档中上传
+                </div>
+              </el-upload>
             </div>
-          </el-upload>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="extractForm.remark"
-            type="textarea"
-            placeholder="请输入备注"
-            :rows="4"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer">
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleSubmit">确定</el-button>
+        <el-button type="primary" @click="handleSubmit">保存</el-button>
       </div>
     </el-dialog>
   </div>
@@ -652,17 +667,13 @@
 </script>
 
 <style scoped>
-  .extract-material-container {
+  /* .extract-material-container {
     padding: 20px;
-  }
+  } */
 
   .extract-controls {
     margin-bottom: 20px;
-    text-align: right;
-  }
-
-  .dialog-footer {
-    text-align: center;
+    text-align: left;
   }
 
   /* 操作按钮样式优化 */
@@ -675,3 +686,73 @@
     background-color: #f5f7fa;
   }
 </style>
+
+<style>
+  /* 弹窗样式 */
+  .extract-material-dialog .dialog-content {
+    padding: 20px;
+  }
+
+  .extract-material-dialog .extract-form {
+    margin: 0;
+  }
+
+  .extract-material-dialog .custom-form-item {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 20px;
+  }
+
+  .extract-material-dialog .custom-form-item .el-form-item__label {
+    width: 100px !important;
+    text-align: center !important;
+    /* color: #409eff !important; */
+    font-size: 14px;
+    flex-shrink: 0;
+    padding: 0 !important;
+    line-height: 32px;
+  }
+
+  .extract-material-dialog .custom-form-item .el-form-item__content {
+    flex: 1;
+    margin-left: 0 !important;
+  }
+
+  .extract-material-dialog .custom-form-item .el-input,
+  .extract-material-dialog .custom-form-item .el-textarea,
+  .extract-material-dialog .custom-form-item .el-input-number {
+    width: 100%;
+  }
+
+  .extract-material-dialog .upload-wrapper {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    align-items: flex-start;
+  }
+
+  .extract-material-dialog .upload-tip {
+    font-size: 12px;
+    color: #909399;
+    line-height: 1.5;
+    margin-top: 10px;
+  }
+
+  .extract-material-dialog .upload-btn {
+    align-self: flex-start;
+  }
+
+  .extract-material-dialog .el-upload {
+    text-align: left;
+  }
+
+  .extract-material-dialog .dialog-footer {
+    text-align: center;
+    padding: 10px 0;
+  }
+
+  .extract-material-dialog .dialog-footer .el-button {
+    margin: 0 10px;
+  }
+</style>

src/views/costAudit/auditInfo/auditManage/messageNotify.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="message-notify-container">
     <el-table style="width: 100%; margin-top: 20px" border :data="formData">
       <el-table-column prop="id" label="序号" width="120" align="center">
         <template slot-scope="scope">
@@ -107,3 +107,9 @@
     },
   }
 </script>
+
+<style scoped>
+  /* .message-notify-container {
+    margin-top: -20px;
+  } */
+</style>

src/views/costAudit/auditInfo/auditManage/workDraft.vue

@@ -42,7 +42,7 @@
         label="时间"
         width="180"
       ></el-table-column>
-      <el-table-column label="附件" width="100">
+      <el-table-column label="附件" width="120">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.attachments && scope.row.attachments.length > 0"
@@ -673,9 +673,9 @@
 </script>
 
 <style scoped>
-  .work-draft-container {
+  /* .work-draft-container {
     padding: 20px;
-  }
+  } */
 
   .working-paper-editor {
     margin-bottom: 20px;