From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style

---
 src/views/sales/salesDetails/AddSalesDetailsDialog.vue |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
index 327f783..67b27cd 100644
--- a/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
+++ b/src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -13,7 +13,7 @@
         :model="editConfig.infomation"
         :rules="rules"
         label-position="right"
-        label-width="308px"
+        label-width="30%"
         size="mini"
         style="height: 60vh; overflow-x: hidden"
       >
@@ -27,6 +27,7 @@
                 <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name">
                   <div class="custom-name">
                     <el-autocomplete
+                      style="width:100%;"
                       v-model="editConfig.infomation.client_name"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -51,13 +52,14 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="璁㈠崟缂栧彿" prop="number">
-                  <el-input v-model="editConfig.infomation.number"></el-input>
+                  <el-input v-model="editConfig.infomation.number" style="width:100%"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="閿�鍞満浼�" prop="saleChanceId">
                   <div class="custom-name">
                     <el-autocomplete
+                      style="width:100%"
                       v-model="editConfig.infomation.sale_chance_name"
                       :fetch-suggestions="
                         (queryString, callback) => {
@@ -100,6 +102,7 @@
                     value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
+                    style="width:100%"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -107,10 +110,11 @@
               <el-col :span="12">
                 <el-form-item label="閿�鍞礋璐ｄ汉" prop="memberId">
                   <el-select
+                  
                     v-model="editConfig.infomation.memberId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
-                    style="width: 63%"
+                    style="width: 100%"
                   >
                     <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                     </el-option>
@@ -124,6 +128,7 @@
                     value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="閫夋嫨鏃ユ湡"
+                    style="width:100%"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -167,9 +172,10 @@
                   <el-input v-model="editConfig.infomation.phone"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="鏀惰揣鍦板潃" prop="address">
                   <el-input
+                    style="width:100%"
                     type="textarea"
                     :autosize="{ minRows: 2 }"
                     v-model="editConfig.infomation.address"
@@ -205,8 +211,9 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="24">
-                <el-form-item label="鏉℃涓庢潯浠�" prop="conditions">
+                <el-form-item label="鏉℃涓庢潯浠�" prop="conditions" label-width="15%">
                   <el-input
+                    style="width:100%;"
                     type="textarea"
                     :autosize="{ minRows: 4 }"
                     v-model="editConfig.infomation.conditions"
@@ -220,7 +227,7 @@
           <div class="basic-info-view">
             <el-row>
               <el-col :span="24">
-                <el-form-item label="澶囨敞" prop="remark">
+                <el-form-item label="澶囨敞" prop="remark" label-width="15%">
                   <el-input
                     type="textarea"
                     :autosize="{ minRows: 2 }"
@@ -381,7 +388,7 @@
   },
   data() {
     return {
-      dialogWidth: "80%",
+      dialogWidth: "60%",
       editConfig: this.editCommonConfig,
       rules: {
         client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
@@ -555,8 +562,10 @@
     handleSelectClient(value, item) {
       if (value === "client") {
         this.clientId = item.id
+        this.editConfig.infomation.client_name = item.name
       } else if (value === "chance") {
         this.saleChanceId = item.id
+        this.editConfig.infomation.client_name = item.name
       }
     },
     selClientClick(value) {
@@ -616,7 +625,7 @@
           { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
           { label: "浜у搧缂栧彿", prop: "number" },
           { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
-          { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
+          { label: "閿�鍞崟浠�", prop: "price",inputFloat: true  },
           { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
       }
@@ -676,6 +685,11 @@
 <style lang="scss" scoped>
 ::v-deep {
   .iframe-dialog .el-dialog__body {
+    .el-form{
+      .el-form-item{
+        width: 100%;
+      }
+    }
     .basic-info {
       .basic-info-title {
         background-color: #f4f8fe;

--
Gitblit v1.8.0