From 73139fab08648ce7be071d7a6fa61e06fc4a67be Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Thu, 10 Nov 2022 18:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply.vue              |  2 +-
 src/views/purchase/purApplyEditDiaolog.vue   | 17 +++++++++++++++--
 src/views/purchase/purPlan.vue               |  2 +-
 src/views/purchase/purPlanAudit.vue          |  4 ++--
 src/views/purchase/purPlanEditDialog.vue     | 13 ++++++++++++-
 src/views/purchase/purPlanSearch.vue         |  2 +-
 src/views/purchase/pureApplyAudit.vue        |  3 ++-
 src/views/purchase/pureApplyDetailDialog.vue |  1 +
 src/views/purchase/pureApplySearch.vue       | 10 +---------
 src/views/thrsys/thrOrderNew.vue             |  2 +-
 10 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/views/purchase/purApply.vue b/src/views/purchase/purApply.vue
index 61cd1b9..014e1ad 100644
--- a/src/views/purchase/purApply.vue
+++ b/src/views/purchase/purApply.vue
@@ -88,7 +88,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purApplyEditDiaolog.vue b/src/views/purchase/purApplyEditDiaolog.vue
index 32c8f94..6a4d209 100644
--- a/src/views/purchase/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApplyEditDiaolog.vue
@@ -85,7 +85,7 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="3">
+                    <el-col :span="3" >
                         <div class="ao-text">
                             <span>申购说明：</span>
                         </div>
@@ -96,6 +96,19 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+              
+                <el-row :gutter="20" style="margin-top: -10px" v-show="formData.status==4">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span>拒绝原因：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item >
+                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
 
 
             </el-card>
@@ -273,7 +286,7 @@ export default {
                         this.$message.warning('未添加产品');
                         return;
                     }
-                    if (status === '0') {
+                    if (status === '2') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue
index f8de056..4818a3d 100644
--- a/src/views/purchase/purPlan.vue
+++ b/src/views/purchase/purPlan.vue
@@ -88,7 +88,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purPlanAudit.vue b/src/views/purchase/purPlanAudit.vue
index fa07482..4ae5dba 100644
--- a/src/views/purchase/purPlanAudit.vue
+++ b/src/views/purchase/purPlanAudit.vue
@@ -61,7 +61,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled=" scope.row.status==3"
+                            :disabled=" scope.row.status!=2"
                             @click.native="newDistributionForm(scope.$index, scope.row)"
                         >审核
                         </el-button
@@ -83,7 +83,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purPlanEditDialog.vue b/src/views/purchase/purPlanEditDialog.vue
index 597f652..f2c648d 100644
--- a/src/views/purchase/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlanEditDialog.vue
@@ -120,6 +120,17 @@
                             <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
                         </el-form-item>
                     </el-col>
+                      <el-col :span="3" v-show="formData.status==4">
+                       <div class="ao-text">
+                            <span>拒绝原因：</span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7" v-show="formData.status==4">
+                        <el-form-item >
+                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+
                 </el-row>
 
 
@@ -299,7 +310,7 @@ export default {
                         this.$message.warning('未添加产品');
                         return;
                     }
-                    if (status === '0') {
+                    if (status === '2') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
diff --git a/src/views/purchase/purPlanSearch.vue b/src/views/purchase/purPlanSearch.vue
index 30a7322..c67827b 100644
--- a/src/views/purchase/purPlanSearch.vue
+++ b/src/views/purchase/purPlanSearch.vue
@@ -82,7 +82,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/pureApplyAudit.vue b/src/views/purchase/pureApplyAudit.vue
index 545edfa..473a86d 100644
--- a/src/views/purchase/pureApplyAudit.vue
+++ b/src/views/purchase/pureApplyAudit.vue
@@ -69,6 +69,7 @@
                     <template slot-scope="scope">
                         <el-button
                             type="text"
+                            :disabled="scope.row.status!=2"
                             size="small"
                             @click.native="newDistributionForm(scope.$index, scope.row)"
                         >审核
@@ -91,7 +92,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/pureApplyDetailDialog.vue b/src/views/purchase/pureApplyDetailDialog.vue
index adbb474..976d74d 100644
--- a/src/views/purchase/pureApplyDetailDialog.vue
+++ b/src/views/purchase/pureApplyDetailDialog.vue
@@ -281,6 +281,7 @@ export default {
                 targetInv: null,
                 targetSubInv: null,
                 targetBillType:null,
+                auditRemark:"",
             },
             formRules: {},
             codeArray: [],
diff --git a/src/views/purchase/pureApplySearch.vue b/src/views/purchase/pureApplySearch.vue
index 0d13c15..73bc088 100644
--- a/src/views/purchase/pureApplySearch.vue
+++ b/src/views/purchase/pureApplySearch.vue
@@ -11,14 +11,6 @@
                             clearable
                         ></el-input>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.status" placeholder="审核状态">
-                            <el-option label="全部" value=""></el-option>
-                            <el-option label="未审核" value="2"></el-option>
-                            <el-option label="已审核" value="3"></el-option>
-                            <el-option label="已拒绝" value="4"></el-option>
-                        </el-select>
-                    </el-form-item>
                     <el-form-item class="query-form-item">
                         <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
                         <el-date-picker
@@ -90,7 +82,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品编码" prop="productId"></el-table-column>
+                <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 84e5173..703d09a 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -475,7 +475,7 @@ export default {
 
                     }
 
-                    if (status === '0') {
+                    if (status === '2') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');