From afbb70a739122c4d0dadf46702a122bdcbd8cdbe Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 23 Sep 2024 15:38:05 +0800
Subject: [PATCH] 20240923

---
 src/views/modules/property/available.vue           |  4 ++--
 .../quote/detail/primary/quoteDetailOther.vue      | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/property/available.vue b/src/views/modules/property/available.vue
index ca32697..4883943 100644
--- a/src/views/modules/property/available.vue
+++ b/src/views/modules/property/available.vue
@@ -782,8 +782,8 @@ export default {
     <el-dialog title="可选值信息" :close-on-click-modal="false" v-drag :visible.sync="availableValueVisible" width="300px">
       <el-form :model="availableValue" label-position="top">
         <el-form-item label="可选值" required>
-          <el-input v-model="availableValue.availableValue" v-if="availableForm.valueType === 'text'"></el-input>
-          <el-input-number style="width: 100%;" :controls="false" :step="0" v-model="availableForm.availableValue" v-if="availableForm.valueType === 'num'"></el-input-number>
+          <el-input v-model="availableValue.availableValue" v-if="availableForm.valueTypeDb === 'T'"></el-input>
+          <el-input-number style="width: 100%;" :controls="false" :step="0" v-model="availableValue.availableValue" v-if="availableForm.valueTypeDb === 'N'"></el-input-number>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/modules/quote/detail/primary/quoteDetailOther.vue b/src/views/modules/quote/detail/primary/quoteDetailOther.vue
index e35f13b..d93e8b1 100644
--- a/src/views/modules/quote/detail/primary/quoteDetailOther.vue
+++ b/src/views/modules/quote/detail/primary/quoteDetailOther.vue
@@ -260,6 +260,16 @@ export default {
       <template slot-scope="scope">
         <span v-if="!item.columnHidden">
             <template v-if="item.columnProp==='valueChooseFlag'">{{ scope.row[item.columnProp] === 'Y' ? '是' : '否' }}</template>
+            <template v-else-if="item.columnProp==='value' && updateStatus === true && scope.row.valueTypeDb==='T' && scope.row.valueChooseFlag==='Y'">
+              <el-select v-model="scope.row['textValue']" placeholder="请选择" style="width: 100%">
+                <el-option :label="available.availableValue" :value="available.availableValue" :key="available.id" v-for="(available) in scope.row.availableList"></el-option>
+              </el-select>
+            </template>
+            <template v-else-if="item.columnProp==='value' && updateStatus === true && scope.row.valueTypeDb==='N' && scope.row.valueChooseFlag==='Y'">
+              <el-select v-model="scope.row['numValue']" placeholder="请选择" style="width: 100%">
+                <el-option :label="available.availableValue" :value="available.availableValue" :key="available.id" v-for="(available) in scope.row.availableList"></el-option>
+              </el-select>
+            </template>
             <template v-else-if="item.columnProp==='value' && updateStatus === true && scope.row.valueTypeDb==='T'">
               <el-input v-model="scope.row['textValue']"></el-input>
             </template>
@@ -267,10 +277,10 @@ export default {
               <el-input-number style="width: 100%" :controls="false" :step="0" v-model="scope.row['numValue']"></el-input-number>
             </template>
             <template v-else-if="item.columnProp==='value' && scope.row.valueTypeDb==='T'">
-              {{ scope.row['textValue'] }}
+              <div style="text-align: left">{{ scope.row['textValue'] }}</div>
             </template>
             <template v-else-if="item.columnProp==='value' && scope.row.valueTypeDb==='N'">
-              {{ scope.row['numValue'] }}
+              <div style="text-align: right">{{ scope.row['numValue'] }}</div>
             </template>
             <template v-else>{{ scope.row[item.columnProp] }}</template>
         </span>