From 1b70723e245fb09253a59ed3b36b1fa44a79b921 Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Mon, 15 Jan 2024 17:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/anno/anncmnt/dev.vue               |  5 ++++
 src/views/anno/anncmnt/manu.vue              | 10 ++++++++
 src/views/anno/anncmnt/manuCertDialog.vue    |  4 +++
 src/views/anno/anncmnt/manuDialog.vue        |  1 +
 src/views/anno/anncmnt/product.vue           | 10 ++++++++
 src/views/anno/anncmnt/productCertDialog.vue |  1 +
 src/views/anno/anncmnt/productDialog.vue     |  1 +
 src/views/anno/anncmnt/ylqxzcr.vue           |  5 ++++
 src/views/anno/anncmnt/ylqxzcrDialog.vue     |  3 ++-
 src/views/anno/anncmnt/ylqxzczh.vue          | 27 ++++++++++++--------
 src/views/anno/anncmnt/ylqxzczhDialog.vue    |  1 +
 11 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/views/anno/anncmnt/dev.vue b/src/views/anno/anncmnt/dev.vue
index 20d89a5..723778c 100644
--- a/src/views/anno/anncmnt/dev.vue
+++ b/src/views/anno/anncmnt/dev.vue
@@ -327,6 +327,10 @@ export default {
         });
     },
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -338,6 +342,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+         });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/manu.vue b/src/views/anno/anncmnt/manu.vue
index 08e3edf..5e60d4d 100644
--- a/src/views/anno/anncmnt/manu.vue
+++ b/src/views/anno/anncmnt/manu.vue
@@ -523,6 +523,10 @@ export default {
     },
 
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -534,6 +538,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+          });
     },
 
     getCertList() {
@@ -552,6 +557,10 @@ export default {
     },
 
     deleteCertDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deleteCert(row)
         .then((response) => {
           if(response.code == 20000){
@@ -563,6 +572,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+          });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/manuCertDialog.vue b/src/views/anno/anncmnt/manuCertDialog.vue
index 54bb4c3..e46af7a 100644
--- a/src/views/anno/anncmnt/manuCertDialog.vue
+++ b/src/views/anno/anncmnt/manuCertDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
@@ -69,6 +70,9 @@
                         :value="item.code"
                       >
                         <span style="float: left">{{ item.code }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px;width:200px">{{
+                            item.productName
+                          }}</span>
                       </el-option>
                     </el-select>
                   </el-form-item>
diff --git a/src/views/anno/anncmnt/manuDialog.vue b/src/views/anno/anncmnt/manuDialog.vue
index ee58a4b..feb4d3f 100644
--- a/src/views/anno/anncmnt/manuDialog.vue
+++ b/src/views/anno/anncmnt/manuDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
diff --git a/src/views/anno/anncmnt/product.vue b/src/views/anno/anncmnt/product.vue
index f3d1359..50806d9 100644
--- a/src/views/anno/anncmnt/product.vue
+++ b/src/views/anno/anncmnt/product.vue
@@ -525,6 +525,10 @@ export default {
     },
 
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -536,6 +540,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+         });
     },
 
     getCertList() {
@@ -554,6 +559,10 @@ export default {
     },
 
     deleteCertDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deleteCert(row)
         .then((response) => {
           if(response.code == 20000){
@@ -565,6 +574,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+         });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/productCertDialog.vue b/src/views/anno/anncmnt/productCertDialog.vue
index 03300c7..0fae613 100644
--- a/src/views/anno/anncmnt/productCertDialog.vue
+++ b/src/views/anno/anncmnt/productCertDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
diff --git a/src/views/anno/anncmnt/productDialog.vue b/src/views/anno/anncmnt/productDialog.vue
index 6ab7abc..33a5128 100644
--- a/src/views/anno/anncmnt/productDialog.vue
+++ b/src/views/anno/anncmnt/productDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
diff --git a/src/views/anno/anncmnt/ylqxzcr.vue b/src/views/anno/anncmnt/ylqxzcr.vue
index ca308ed..e4d15c9 100644
--- a/src/views/anno/anncmnt/ylqxzcr.vue
+++ b/src/views/anno/anncmnt/ylqxzcr.vue
@@ -325,6 +325,10 @@ export default {
         });
     },
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -336,6 +340,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+        });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/ylqxzcrDialog.vue b/src/views/anno/anncmnt/ylqxzcrDialog.vue
index a51a0eb..83b407b 100644
--- a/src/views/anno/anncmnt/ylqxzcrDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzcrDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form  :model="inputQuery"  label-width="120px" >
+      <el-form  :model="inputQuery"  label-width="150px" >
         <template v-for="(itemRow, indexRow) in fromList">
           <el-row :gutter="20" class="el-row" type="flex">
             <template v-for="(item, index) in itemRow.list">
@@ -54,6 +54,7 @@
                           {{item.columnDesc}}
                         </span>
                     <el-select
+                     :style="item.style"
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
                       @change="executeFuc($event,'5',item.clickFuc)"
diff --git a/src/views/anno/anncmnt/ylqxzczh.vue b/src/views/anno/anncmnt/ylqxzczh.vue
index ae312d2..e5bec57 100644
--- a/src/views/anno/anncmnt/ylqxzczh.vue
+++ b/src/views/anno/anncmnt/ylqxzczh.vue
@@ -325,17 +325,22 @@ export default {
         });
     },
     deleteDialog(_this,row) {
-      deletegg(row)
-        .then((response) => {
-          if(response.code == 20000){
-            _this.getList()
-          }else{
-            _this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          _this.$message.error(response.message);
-        });
+     _this.$confirm("确认删除吗?", "提示", {
+         type: "warning",
+       })
+       .then(() => {
+          deletegg(row)
+            .then((response) => {
+              if(response.code == 20000){
+                _this.getList()
+              }else{
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              _this.$message.error(response.message);
+            });
+         })
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/ylqxzczhDialog.vue b/src/views/anno/anncmnt/ylqxzczhDialog.vue
index 12b050e..75806a8 100644
--- a/src/views/anno/anncmnt/ylqxzczhDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzczhDialog.vue
@@ -55,6 +55,7 @@
                         </span>
                     <el-select
                       v-model="inputQuery[item.columnName]"
+                      :style="item.style"
                       :placeholder="item.columnDesc"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"