From b9bb79bd9e98b9ae380ea499ad4e5b1542ba30c4 Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Thu, 10 Nov 2022 14:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=B4=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BusTypeChange.vue             |  2 +-
 src/views/basic/basicCompany.vue              | 38 ++++++++++++++++---
 src/views/purchase/supCertificationAdd.vue    |  8 ++++
 .../purchase/supManufacturerEditDialog.vue    | 24 ++++++++++--
 src/views/purchase/supProductEditDialog.vue   | 17 +++++++++
 src/views/warehouse/stockOrderDelSearch.vue   |  4 +-
 6 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue
index f213091..f7886f9 100644
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@@ -4,7 +4,7 @@
             <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
                     <el-input
-                        v-model="filterQuery.name"
+                        v-model="filterQuery.originAction"
                         placeholder="业务类型"
                         style="width: 400px"
                     ></el-input>
diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue
index 85fbea0..69330d5 100644
--- a/src/views/basic/basicCompany.vue
+++ b/src/views/basic/basicCompany.vue
@@ -142,11 +142,7 @@
                 </el-row>
             </el-card>
             <el-card>
-                <div style=" float: right;
-                        text-align: right;
-                        margin-bottom: 8px;"
-                >
-
+                <div style="float: right;text-align: right;margin-bottom: 8px;">
                     <el-button type="primary" size="mini" icon="search" @click="selectCert"
                                style="text-align:right"
                     >选入资质证书
@@ -214,6 +210,14 @@
                             >删除
                             </el-button
                             >
+                            <el-button
+                                type="text"
+                                size="small"
+                                v-if="scope.row.auditStatus == 2"
+                                @click.native="explainCompanyCert(scope.row)"
+                            >说明
+                            </el-button
+                            >
 
                             <!--                            <el-button-->
                             <!--                                type="text"-->
@@ -281,6 +285,19 @@
                 ></supCertSetSelectDialog>
             </el-dialog>
 
+            <!-- <el-dialog
+                :title="拒绝原因"
+                :visible.sync="explainCertVisible"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                width="40%"
+                v-if="explainCertVisible"
+                append-to-body
+                @close='closeLocalDialog'
+            >
+            <el-form-item label="拒绝原因:"><el-input v-model="explainMsg"  placeholder="请输入内容"></el-input></el-form-item>
+            </el-dialog> -->
+            
 
         </el-form>
     </div>
@@ -421,6 +438,8 @@ export default {
             productLoading: false,
             uuid: null,
             companyApplyUpdateVisible: false,
+            explainCertVisible:false,
+            explainMsg:'',
             companyEditDisabled: true,
             companyEditButtonStr: "编辑",
             addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
@@ -604,7 +623,16 @@ export default {
                     this.certList = [];
                 });
         },
+        explainCompanyCert(row) {
+            this.$confirm(row.auditComment, "拒绝原因", {
+                confirmButtonText: "确定",
+                type: "warning",
+                showCancelButton: false,
+            }).then(() => {
 
+            });
+           
+        },
         deleteCompanyCert(row) {
             this.$confirm("是否删除?", "提示", {
                 confirmButtonText: "确定",
diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue
index d49d951..30273b9 100644
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@@ -189,6 +189,13 @@
                         >删除
                         </el-button
                         >
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.auditStatus === 2"
+                            @click.native.stop="rejectInfo(scope.row)"
+                        >说明
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -477,6 +484,7 @@ export default {
                 this.$message.error("请先选中生产企业！");
                 return
             }
+           
             if (this.$isNotBlank(row)) {
                 this.registrationId = row.id;
                 this.curProductQuery = row;
diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue
index e1de3c7..c893f74 100644
--- a/src/views/purchase/supManufacturerEditDialog.vue
+++ b/src/views/purchase/supManufacturerEditDialog.vue
@@ -331,6 +331,7 @@ import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {getSupComapnys} from "@/api/purchase/supCompany";
 import {getUUID} from "@/utils/strUtil";
 import supCertSetSelectDialog from "@/views/purchase/supCertSetSelectDialog";
+import {getCompany} from "@/api/warehouse/company";
 
 export default {
     name: "supManufacturerEdit",
@@ -500,12 +501,22 @@ export default {
     methods: {
         onModifySubmit(type) {
 
-            this.$refs["inputQuery"].validate(valid => {
-                if (valid) {
+            //判断本企业产品是否是通过审核的
+            if(type==3){
+                let query = {
+                  customerId: this.$store.getters.customerId
+            }
+            getCompany(query)
+                .then((response) => {
+                   if(response.data.auditStatus!=1){
+                    this.$message.error("本企业信息还未通过审核!");
+                    return;
+                   }else{
+                    this.$refs["inputQuery"].validate(valid => {
+                     if (valid) {
 
                     let formData = JSON.parse(JSON.stringify(this.inputQuery));
                     formData.auditStatus = type;
-
                     this.loading = true;
                     let urlName = this.editType == 0 ? 'add' : 'update';
                     addOrModifyCompany(formData, urlName).then(response => {
@@ -522,6 +533,13 @@ export default {
                     return false;
                 }
             });
+                   }
+                   }).catch(() => {
+
+                });
+            }
+
+          
         },
         certHandleCurrentChange(val) {
             this.certQuery.page = val;
diff --git a/src/views/purchase/supProductEditDialog.vue b/src/views/purchase/supProductEditDialog.vue
index 4afcee2..c7fd315 100644
--- a/src/views/purchase/supProductEditDialog.vue
+++ b/src/views/purchase/supProductEditDialog.vue
@@ -291,6 +291,13 @@
                         >删除
                         </el-button
                         >
+                        <el-button
+                            type="text"
+                            size="small"
+                            v-if="scope.row.auditStatus === 2"
+                            @click.native.stop="rejectInfo(scope.row)"
+                        >说明
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -564,6 +571,16 @@ export default {
         toViewCompanyCert(row) {
             window.open(this.certFileUrl + row.filePath);
         },
+        rejectInfo(row) {
+            this.$confirm(row.auditComment, "拒绝说明", {
+                confirmButtonText: "确定",
+                type: "warning",
+                showCancelButton: false,
+            })
+                .then(() => {
+                });
+
+        },
 
         findMethod(query) {
             this.fromOptions = [];
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index f4a2da7..fddf6e1 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -138,13 +138,13 @@
                             </el-button>
                         </div>
 
-                        <el-button
+                        <!-- <el-button
                             v-if="isSp ==110"
                             type="text"
                             size="small"
                             @click.native="rollback(scope.row)"
                         >撤回
-                        </el-button>
+                        </el-button> -->
 
                     </template>
                 </el-table-column>