From efebc4419db385def24e4455dede9ed21111fb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Fri, 26 Jun 2026 11:22:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/supplier/purHeaderList.vue  | 26 ++++++++++++++++---
 .../modules/supplier/quoPurDetailList.vue     | 19 +++++++++++++-
 .../modules/supplier/supPurReplyHistList.vue  |  8 ++++++
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/supplier/purHeaderList.vue b/src/views/modules/supplier/purHeaderList.vue
index 9545ed2..f0df037 100644
--- a/src/views/modules/supplier/purHeaderList.vue
+++ b/src/views/modules/supplier/purHeaderList.vue
@@ -73,7 +73,7 @@
     <!-- 子表：物料明细列表 - 始终显示表头 -->
     <div class="sub-title">
       物料明细列表
-       <el-button type="primary" class="customer-bun-min" @click="openMaterialDialog()" style="margin-left: 10px;">新增物料</el-button>
+       <el-button v-if="canAddMaterial()" type="primary" class="customer-bun-min" @click="openMaterialDialog()" style="margin-left: 10px;">新增物料</el-button>
     </div>
 
     <el-table
@@ -84,8 +84,8 @@
       style="width:100%">
       <el-table-column fixed="right" label="操作" header-align="center" align="center" width="160">
         <template slot-scope="scope">
-          <el-link style="cursor: pointer" @click="openMaterialDialog(scope.row)">编辑 |</el-link>
-          <el-link style="cursor: pointer" @click="deleteMaterial(scope.row)">删除 |</el-link>
+          <el-link v-if="isMaterialEditable(scope.row)" style="cursor: pointer" @click="openMaterialDialog(scope.row)">编辑 |</el-link>
+          <el-link v-if="isMaterialEditable(scope.row)" style="cursor: pointer" @click="deleteMaterial(scope.row)">删除 |</el-link>
           <el-link style="cursor: pointer" @click="openUploadDialog(scope.row)">附件</el-link>
         </template>
       </el-table-column>
@@ -944,15 +944,29 @@ export default {
     },
 
     // 物料操作
+    isMaterialEditable(row) {
+      return row && (row.status === '待提交' || row.status === '待报价')
+    },
+    canAddMaterial() {
+      return this.currentInquiry && (this.currentInquiry.status === '待提交' || this.currentInquiry.status === '待报价')
+    },
     openMaterialDialog(row) {
       if (!this.currentInquiry) {
         this.$message.warning('请先选择一个询价单')
         return
       }
       if (row) {
+        if (!this.isMaterialEditable(row)) {
+          this.$message.warning('只有待提交或待报价状态的明细可以编辑')
+          return
+        }
         this.materialDialogTitle = '编辑物料'
         this.materialForm = { ...row }
       } else {
+        if (!this.canAddMaterial()) {
+          this.$message.warning('当前询价单状态不允许新增物料')
+          return
+        }
         this.materialDialogTitle = '新增物料'
         this.materialForm = {
           id: null,
@@ -963,7 +977,7 @@ export default {
           spec: '',
           qty: 0,
           remark2: '',
-          status: '待提交'
+          status: this.currentInquiry.status === '待报价' ? '待报价' : '待提交'
         }
       }
       this.materialDialogVisible = true
@@ -1043,6 +1057,10 @@ export default {
       })
     },
     deleteMaterial(row) {
+      if (!this.isMaterialEditable(row)) {
+        this.$message.warning('只有待提交或待报价状态的明细可以删除')
+        return
+      }
       this.$confirm('确定删除物料: ' + row.partNo + ' ?', '提示', { type: 'warning' }).then(() => {
         deleteMaterial({ id: row.id }).then(({data}) => {
           if (data && data.code === 0) {
diff --git a/src/views/modules/supplier/quoPurDetailList.vue b/src/views/modules/supplier/quoPurDetailList.vue
index a914031..2c0cc7d 100644
--- a/src/views/modules/supplier/quoPurDetailList.vue
+++ b/src/views/modules/supplier/quoPurDetailList.vue
@@ -382,7 +382,19 @@ export default {
         createdBy: this.$store.state.user.name
       },
       quoteRules: {
-        price: [{ required: true, message: '请输入未税单价', trigger: 'blur' }],
+        price: [
+          { required: true, message: '请输入未税单价', trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || Number(value) <= 0) {
+                callback(new Error('未税单价必须大于0'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur'
+          }
+        ],
         taxRate: [{ required: true, message: '请输入税率', trigger: 'blur' }]
       },
       // 上次填写的报价信息（用于残留功能）
@@ -567,8 +579,13 @@ export default {
 
     // 提交报价
     submitQuote() {
+      this.calculatePrice()
       this.$refs.quoteForm.validate((valid) => {
         if (valid) {
+          if (!this.quoteForm.price || Number(this.quoteForm.price) <= 0) {
+            this.$message.error('未税单价必须大于0')
+            return
+          }
           // 计算总成本（可选）
           const totalCost = this.quoteForm.materialCost + this.quoteForm.produceFee +
                            this.quoteForm.surfaceFee + this.quoteForm.profit +
diff --git a/src/views/modules/supplier/supPurReplyHistList.vue b/src/views/modules/supplier/supPurReplyHistList.vue
index 2bf9f1c..f4eec00 100644
--- a/src/views/modules/supplier/supPurReplyHistList.vue
+++ b/src/views/modules/supplier/supPurReplyHistList.vue
@@ -11,6 +11,13 @@
       <el-form-item :label="'物料名称'">
         <el-input v-model="searchData.partDesc" placeholder="物料名称" style="width:200px" @keyup.enter.native="getList" />
       </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.approvalFilter" placeholder="请选择" style="width:120px">
+          <el-option label="全部" value="all" />
+          <el-option label="需要审批" value="need" />
+          <el-option label="不需要审批" value="none" />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'报价日期'">
             <el-date-picker
               style="width: 130px"
@@ -559,6 +566,7 @@ export default {
         partNo: '',
         partDesc: '',
         status: '',
+        approvalFilter: 'need',
         notExistsStatus: '已关闭'
       },