update

src/packages/pc/assets/themes/default/default.less

@@ -7,8 +7,8 @@
     --font-x-small: 10px;
     /* 颜色规范 */
     --color-default: #384048;
-    --color-primary: #409EFF;
-    --color-secondary: #04c786;
+    --color-primary: #3077af;
+    --color-secondary: #4786bb;
     --color-info: #999;
     --color-border: #eee;
     /* 间距规范 */
@@ -16,17 +16,25 @@
     /* 状态栏 */
     --statusbar-height: 56px;
     /* 标签栏 */
-    --tabbar-active: #2562b6;
+    --tabbar-active: var(--color-primary);
     --tabbar-hover: #eee;
     --tabbar-close-hover: red;
     /* 侧边栏 */
     --sidebar-width: 180px;
-    --sidebar-background: #2270d9;
+    --sidebar-background: var(--color-primary);
     --sidebar-header-height: 56px;
     --sidebar-menu-inline: #fff;
-    --sidebar-menu-item: rgba(255, 255, 255, .5);
-    --sidebar-menu-item-hover: transparent;
-    --sidebar-menu-item-active: #2562b6;
+    --sidebar-menu-item: #b3d5ef;
+    --sidebar-menu-item-hover: #4786bb;
+    --sidebar-menu-item-active: #266091;
+
+    --el-color-primary: var(--color-primary);
+    --el-color-primary-light-3: #4b95ce;
+    --el-color-primary-light-5: #70abd8;
+    --el-color-primary-light-7: #c6e2ff;
+    --el-color-primary-light-8: #d9ecff;
+    --el-color-primary-light-9: #ecf5ff;
+    --el-color-primary-dark-2: #2d70a3;
 
     .el-form {
         &-item {
@@ -39,11 +47,6 @@
             &:last-child {
                 margin-bottom: 18px;
             }
-
-            .el-select,
-            .el-input-number {
-                width: 100%;
-            }
         }
 
         &--horizontal {
@@ -66,6 +69,19 @@
                     width: 100%;
                 }
             }
+
+            .el-select,
+            .el-input-number {
+                width: 100%;
+            }
+        }
+
+        &--vertical {
+
+            .el-select,
+            .el-input-number {
+                width: 100%;
+            }
         }
     }
 

src/packages/pc/views/centralize/mine/components/add/price-edit.vue

@@ -1,7 +1,7 @@
 <!-- 集采交易-我的集采-集采申请-价格编辑 -->
 <template>
     <app-drawer title="编辑" :width="400" v-model:show="show">
-        <el-form ref="formRef" label-width="60px" :model="formItem" :rules="formRules">
+        <el-form ref="formRef" class="el-form--vertical" label-width="60px" :model="formItem" :rules="formRules">
             <el-form-item label="数量" prop="Qty">
                 <el-input-number placeholder="请输入" :min="0" :precision="0" v-model="formItem.Qty" />
             </el-form-item>

src/packages/pc/views/search/diamond/index.vue

@@ -22,15 +22,14 @@
                     <app-multiple :data-list="enums.polishTypeList" v-model="formData.zspolishtype" checkbox />
                 </el-form-item>
                 <el-form-item label="荧光">
-                    <app-multiple :data-list="enums.fluorescenceTypeList" v-model="formData.zsfluorescencetype"
-                        checkbox />
+                    <app-multiple :data-list="enums.fluorescenceTypeList" v-model="formData.zsfluorescencetype" checkbox />
                 </el-form-item>
-                <!-- <el-form-item label="仓库">
+            <!-- <el-form-item label="仓库">
                     <el-select v-model="formData.warehouseid" clearable>
                         <el-option :label="item.warehousename" :value="item.autoid"
                             v-for="(item, index) in warehouseList" :key="index" />
                     </el-select>
-                </el-form-item> -->
+                    </el-form-item> -->
                 <el-form-item label="货币">
                     <app-multiple :data-list="enums.currencyTypeList" v-model="formData.zscurrencytype" checkbox />
                 </el-form-item>

src/packages/pc/views/search/fancy/index.vue

@@ -19,15 +19,14 @@
                     <app-multiple :data-list="enums.polishTypeList" v-model="formData.zspolishtype" checkbox />
                 </el-form-item>
                 <el-form-item label="荧光">
-                    <app-multiple :data-list="enums.fluorescenceTypeList" v-model="formData.zsfluorescencetype"
-                        checkbox />
+                    <app-multiple :data-list="enums.fluorescenceTypeList" v-model="formData.zsfluorescencetype" checkbox />
                 </el-form-item>
-                <!-- <el-form-item label="仓库">
+            <!-- <el-form-item label="仓库">
                     <el-select v-model="formData.warehouseid" clearable>
                         <el-option :label="item.warehousename" :value="item.autoid"
                             v-for="(item, index) in warehouseList" :key="index" />
                     </el-select>
-                </el-form-item> -->
+                    </el-form-item> -->
                 <el-form-item label="货币">
                     <app-multiple :data-list="enums.currencyTypeList" v-model="formData.zscurrencytype" checkbox />
                 </el-form-item>

src/packages/pc/views/warehousing/goods/components/bargain/index.vue

@@ -26,8 +26,8 @@
 
 <script lang="ts" setup>
 import { ref, PropType, computed } from 'vue'
-import { ElMessage } from 'element-plus'
-import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage, FormInstance, FormRules } from 'element-plus'
+import { regular } from '@/constants/regex'
 import { CurrencyType } from '@/constants/diamond'
 import { exrateStore } from '@/stores'
 import { useBuyOrderBargain } from '@/business/trade/desting'
@@ -46,7 +46,11 @@ const formRef = ref<FormInstance>()
 const show = ref(true)
 
 const formRules: FormRules = {
-    ApplyPrice: [{ required: true, message: '请输入价格', trigger: 'blur' }],
+    ApplyPrice: [{
+        required: true,
+        message: '请输入价格',
+        pattern: regular.positive.reg
+    }],
 }
 
 const priceLable = computed(() => {

src/packages/pc/views/warehousing/goods/components/details/index.vue

@@ -63,7 +63,7 @@
                     </div>
                     <div class="sku-button" v-if="showButton && details.wrtradeorderid">
                         <el-button type="primary" size="large" @click="openComponent('buy')">立即购买</el-button>
-                        <el-button type="success" size="large" @click="openComponent('bargain')">询价申请</el-button>
+                        <el-button type="warning" size="large" @click="openComponent('bargain')">询价申请</el-button>
                         <el-button @click="openComponent('favorite')" size="large" icon="StarFilled" link
                             v-if="!hasFavorite(details.goodsno)">收藏</el-button>
                     </div>