From 508f805bae4f74c9432d82c045d895a62ea1f099 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期六, 21 十月 2023 13:32:49 +0800
Subject: [PATCH] Merge branch 'zwf/style' into dev

---
 src/components/makepager/CommonFormTableView.vue |   87 ++++++++++++++++++++++++++-----------------
 1 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index e5a99d1..0e99386 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -9,8 +9,10 @@
     >
       <el-table
         :data="tableList.tableData"
+        border
         style="width: 100%"
-        :height="isinventory || islistingrules ? 'calc(100% - 0px)' : ''"
+        :height="'calc(100% - 0px)'"
+        :class="{ setHeight: isinventory || islistingrules }"
         :header-cell-style="{ background: '#f1f3f8', color: '#000009' }"
         :row-class-name="tableRowClassName"
         @row-click="tableRowClick"
@@ -57,25 +59,14 @@
                 :prop="'tableData.' + scope.$index + '.' + item.prop"
               >
                 <div class="custom-name">
-                  <el-select
-                    v-model="scope.row[item.prop]"
-                    placeholder="璇烽�夋嫨"
-                    size="mini"
-                    style="width: 80%"
-                    @change="
-                      (val) => {
-                        selProductNameClick(val)
-                      }
-                    "
+                  <SimpleSearchInput
+                    :echoValue="scope.row[item.prop]"
+                    :echoName="scope.row[item.prop]"
+                    checkedNum="1"
+                    :clearable="true"
+                    @select-user="selProductNameClick"
                   >
-                    <el-option
-                      v-for="item in productNameOptions"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="{ value: item.id, label: item.name, amount: item.amount, unit: item.unit }"
-                    >
-                    </el-option>
-                  </el-select>
+                  </SimpleSearchInput>
                 </div>
               </el-form-item>
               <el-form-item
@@ -119,7 +110,6 @@
                   v-else
                   v-model="scope.row[item.prop]"
                   placeholder=""
-                  :min="0"
                   :precision="2"
                   :controls="false"
                   size="mini"
@@ -147,7 +137,9 @@
               <!-- 浣嶇疆 -->
               <el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                 <div class="custom-name">
-                  <span v-if="scope.row.isEdit || scope.row.editable">{{ scope.row[item.prop] }}</span>
+                  <span v-if="scope.row.isEdit || scope.row.editable">{{
+                    scope.row[item.prop]?.label ?? scope.row[item.prop]
+                  }}</span>
                   <el-select
                     v-else
                     v-model="scope.row[item.prop]"
@@ -257,10 +249,11 @@
 import { getLocationList } from "@/api/warehouseManage/warehouse"
 import { getCompanyList } from "@/api/common/other"
 import { getRuleList } from "@/api/operate/inventoryAdjustment"
+import SimpleSearchInput from "@/components/makepager/SimpleSearchInput"
 // import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
 export default {
   name: "CommmonFormTableView",
-  components: {},
+  components: { SimpleSearchInput },
   props: {
     detailEnter: {
       type: Boolean,
@@ -384,13 +377,15 @@
       })
     },
     selProductNameClick(item) {
+      console.log(item)
       this.tableList.tableData.map((ite) => {
-        if (ite.productName.label === item.label) {
-          ite.productId = item.value
-          ite.productName = item.label
-          ite.amount = item.amount
-          ite.unit = item.unit
-        }
+        console.log(ite)
+        // if (ite.productName === item.name) {
+        ite.productId = item.id
+        ite.productName = item.name
+        ite.amount = item.amount
+        ite.unit = item.unit
+        // }
       })
       console.log(this.tableList.tableData)
     },
@@ -534,6 +529,9 @@
     // 鍗曢�夎鐩稿叧
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex
+    },
+    setFormItem(val) {
+      console.log(val)
     }
   }
 }
@@ -552,9 +550,12 @@
     .custom-name {
       display: flex;
       justify-content: center;
+      font-size: 12px;
+      line-height: 17px;
+      font-family: PingFangSC;
       .common-select-btn {
         margin-left: 5px;
-        font-size: 18px;
+        font-size: 13px;
         cursor: pointer;
       }
     }
@@ -564,20 +565,38 @@
   .el-form-item__label {
     display: none;
   }
+  .el-form-item__content {
+    // height: 28px; /* 璁剧疆楂樺害 */
+    line-height: 22px; /* 璁剧疆琛岄珮 */
+  }
   .el-table__footer-wrapper tbody td.el-table__cell {
     background-color: #fff;
     // text-align: right;
     font-weight: bold;
   }
-  .el-input--suffix .el-input__inner {
-    padding-right: 0px;
-  }
   .el-table .cell,
   .el-table th.el-table__cell > .cell {
     padding: 0 5px;
   }
-  .el-input__inner {
-    text-align: left;
+  // .el-input__inner {
+  //   text-align: left;
+  // }
+}
+
+::v-deep .el-table .cell {
+  font-size: 12px;
+  line-height: 17px;
+  font-family: PingFangSC;
+  color: rgba(0, 0, 0, 0.9);
+  .el-button--text {
+    width: auto;
+    height: auto;
+    font-family: PingFangSC-Medium, sans-serif;
   }
 }
+::v-deep .el-table .el-table__cell {
+  padding: 6px 0 !important;
+  height: 35px;
+  text-align: center;
+}
 </style>

--
Gitblit v1.8.0