From 6aa850495e6562b1fbcf02e174c7aa3f08f18a1e Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:30:21 +0800
Subject: [PATCH] =?UTF-8?q?2024.9.23=20=E4=B8=80=E3=80=81=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=88=90=E6=9C=AC=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=EF=BC=88=E7=AC=AC=E4=BA=8C=E7=89=88=EF=BC=89=20=E4=BA=8C?=
 =?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0=20=E4=B8=89=E3=80=81=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=B8=89=E7=89=88=EF=BC=89?=
 =?UTF-8?q?=20=E5=9B=9B=E3=80=81=E5=95=86=E5=93=81=E7=BB=84=20-=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B7=A5=E5=BA=8F=EF=BC=88=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E7=89=88=EF=BC=89=20=E4=BA=94=E3=80=81=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BB=84=20-=20Process=20Time=20Matrix=EF=BC=88=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=89=88=E4=BF=AE=E6=AD=A3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../part/partProductGroupInformation.vue      | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/part/partProductGroupInformation.vue b/src/views/modules/part/partProductGroupInformation.vue
index f239826..0db7c00 100644
--- a/src/views/modules/part/partProductGroupInformation.vue
+++ b/src/views/modules/part/partProductGroupInformation.vue
@@ -287,15 +287,6 @@
               :min-width="item.columnWidth"
               :label="item.columnLabel">
               <template slot-scope="scope">
-                <div v-if="item.columnProp === 'valueType'">
-                  <span v-if="scope.row.valueType === 'text'">
-                    文本
-                  </span>
-                  <span v-else-if="scope.row.valueType === 'num'">
-                    数字
-                  </span>
-                </div>
-                <div v-else>
                   <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
                     <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
                     <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
@@ -303,7 +294,6 @@
                   <div v-else>
                     {{ scope.row.textValue ? scope.row.textValue : scope.row.numValue }}
                   </div>
-                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -377,26 +367,17 @@
           :label="item.columnLabel"
         >
           <template slot-scope="scope">
-            <div v-if="item.columnProp === 'valueType'">
-                  <span v-if="scope.row.valueType === 'text'">
-                    文本
-                  </span>
-              <span v-else-if="scope.row.valueType === 'num'">
-                    数字
-                  </span>
-            </div>
-            <div v-else>
               <div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
                 <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
                 <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
               </div>
               <div v-else>
                 <div v-if="scope.row.valueChooseFlag !== 'Y'">
-                  <el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueType === 'num'" :controls="false"></el-input-number>
+                  <el-input-number v-model="scope.row.numValue" style="padding: 0;width: 100%" v-if="scope.row.valueTypeDb === 'N'" :controls="false"></el-input-number>
                   <el-input v-model="scope.row.textValue" v-else></el-input>
                 </div>
                 <div v-else>
-                  <el-select style="width: 100%;" v-if="scope.row.valueType === 'text'" v-model="scope.row.textValue">
+                  <el-select style="width: 100%;" v-if="scope.row.valueTypeDb === 'T'" v-model="scope.row.textValue">
                     <el-option :value="i.availableValue" :label="i.availableValue" v-for="(i,key) in scope.row.availableValueList" :key="key"></el-option>
                   </el-select>
                   <el-select style="width: 100%;" v-else v-model="scope.row.numValue">
@@ -404,7 +385,6 @@
                   </el-select>
                 </div>
               </div>
-            </div>
           </template>
         </el-table-column>
       </el-table>