From fffd7e32acf8fa6b6fc1ebb99c57be823a066cf3 Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Wed, 21 Feb 2024 17:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/cert/supCertAudit.vue      |  8 +++---
 .../supplier/products/supDiProductsCheck.vue  | 25 +++++++++++++++----
 .../system/customConfig/configDetail.vue      | 21 ++++++++++++++++
 .../system/customConfig/configFromDetail.vue  | 21 ++++++++++++++++
 .../system/customConfig/configQueryDetail.vue | 21 ++++++++++++++++
 src/views/userManage/customerManage.vue       |  2 +-
 6 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue
index d230a0d..79b8bf5 100644
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@@ -20,7 +20,7 @@
         <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <el-form-item  :style="item.style?item.style:item.width?'width:'+(item.width)+'px':''" v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -249,7 +249,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'failCout'" label="生产企业证书" prop="auditStatus" width="120">
+          <el-table-column v-if="item.columnName == 'failCout'"  :label="item.columnDesc" prop="auditStatus"  :width="item.width">
             <template slot-scope="scope">
 
               <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
@@ -264,7 +264,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column v-if="item.columnName == 'productFailCout'" label="配送产品证书" prop="auditStatus" width="120">
+          <el-table-column v-if="item.columnName == 'productFailCout'"  :label="item.columnDesc" prop="auditStatus"  :width="item.width">
             <template slot-scope="scope">
               <el-tag type="danger" v-if="scope.row.productFailCout==0 && scope.row.prouctPassCout==0">
                 未添加证书
@@ -537,7 +537,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column v-if="item.columnName == 'failCout'" label="配送产品证书" prop="auditStatus" width="120">
+            <el-table-column v-if="item.columnName == 'failCout'" :label="item.columnDesc" prop="auditStatus" :width="item.width">
               <template slot-scope="scope">
 
                 <el-tag type="danger" v-if="scope.row.failCout==0 && scope.row.passCout==0">
diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue
index bf90d50..cc7cf9d 100644
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@@ -461,13 +461,28 @@ export default {
         .catch(() => {
         })
     },
-    detailDialog(_this,row, type) {
-      if (type == 1) {
-        _this.title = "产品信息详情"
+    detailDialog(_this,row) {
+      _this.title = "产品信息详情"
+      if (row.type == 1) {
+        let query = {devKey: row.deviceRecordKey}
+        getDiProductDetail(query).then((res) => {
+          if (res.code === 20000) {
+            _this.thisData = res.data
+            _this.editDate = row
+            _this.thisData.isAudit = type
+            _this.thrProductsDiDetailVisible = true
+          } else {
+            _this.$message.error('参数错误')
+          }
+        })
       } else {
-        _this.title = "物资入院审核"
+        _this.thisDetail = row;
+        _this.thisDetail.isAudit = type
+        _this.thrProductsDetailVisible = true;
       }
-
+    },
+    auditDialog(_this,row) {
+      _this.title = "物资入院审核"
       if (row.type == 1) {
         let query = {devKey: row.deviceRecordKey}
         getDiProductDetail(query).then((res) => {
diff --git a/src/views/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue
index 072f332..d63bef7 100644
--- a/src/views/system/customConfig/configDetail.vue
+++ b/src/views/system/customConfig/configDetail.vue
@@ -414,6 +414,27 @@
         this.subData.configId = this.info.configId,
           this.subData.type = this.type;
         this.formVisible = true;
+        if("add" == formName){
+          this.conditionForm = {
+            lableList: [{
+              name: '',
+              value: ''
+            }],
+              colorList: [{
+              type: '',
+              value: '',
+              color: ''
+            }],
+              buttonList: [{
+              type: '',
+              size: '',
+              style: '',
+              name: '',
+              clickFuc: '',
+              hasPermi:'',
+            }]
+          }
+        }
         if("edit" == formName){
            const colorRule =  this.subData.colorRule;
            var colorList = [{type: '', value: '', color: ''}]
diff --git a/src/views/system/customConfig/configFromDetail.vue b/src/views/system/customConfig/configFromDetail.vue
index 5902d7c..19ca881 100644
--- a/src/views/system/customConfig/configFromDetail.vue
+++ b/src/views/system/customConfig/configFromDetail.vue
@@ -415,6 +415,27 @@
         this.subData.configId = this.info.configId;
         this.subData.type = this.type;
         this.formVisible = true;
+        if("add" == formName){
+          this.conditionForm = {
+            lableList: [{
+              name: '',
+              value: ''
+            }],
+            colorList: [{
+              type: '',
+              value: '',
+              color: ''
+            }],
+            buttonList: [{
+              type: '',
+              size: '',
+              style: '',
+              name: '',
+              clickFuc: '',
+              hasPermi:'',
+            }]
+          }
+        }
         if("edit" == formName){
 
         }
diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue
index 8483b4c..69e15db 100644
--- a/src/views/system/customConfig/configQueryDetail.vue
+++ b/src/views/system/customConfig/configQueryDetail.vue
@@ -338,6 +338,27 @@
         this.subData.configId = this.info.configId,
           this.subData.type = this.type;
         this.formVisible = true;
+        if("add" == formName){
+          this.conditionForm = {
+            lableList: [{
+              name: '',
+              value: ''
+            }],
+            colorList: [{
+              type: '',
+              value: '',
+              color: ''
+            }],
+            buttonList: [{
+              type: '',
+              size: '',
+              style: '',
+              name: '',
+              clickFuc: '',
+              hasPermi:'',
+            }]
+          }
+        }
         if("edit" == formName){
           const lableRule =  this.subData.lableRule;
           var lableList = [{name: '', value: ''}]
diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue
index fa40b03..21222ec 100644
--- a/src/views/userManage/customerManage.vue
+++ b/src/views/userManage/customerManage.vue
@@ -415,7 +415,7 @@
                             <span slot="label">
                               {{item.columnDesc}}
                             </span>
-                      <el-radio-group :style="item.style" v-model="formData[item.columnName]">
+                      <el-radio-group v-model="formData[item.columnName]">
                         <el-radio
                           v-for="dict in item.lableRuleObj"
                           :key="parseInt(dict.value)"