Selaa lähdekoodia

Merge branch 'release_v1.0.0' of http://git.qmth.com.cn/sop/web into dev_1.0.1

刘洋 1 vuosi sitten
vanhempi
commit
c1b0cf75fb

+ 2 - 1
src/style/global.less

@@ -254,7 +254,8 @@ body {
   font-size: 16px;
   font-weight: bold;
   // color: @dark-text-color;
-  color: var(--td-brand-color);
+  // color: var(--td-brand-color);
+  color: #262626;
   line-height: 24px;
 }
 .form-item-title {

+ 7 - 1
src/views/system/config-manage/customer-manage/edit-customer-dialog.vue

@@ -10,6 +10,11 @@
   >
     <t-form ref="formRef" :data="formData" :rules="rules" labelAlign="top">
       <t-row :gutter="[20, 20]">
+        <t-col :span="6">
+          <t-form-item label="客户ID" name="code">
+            <t-input v-model="formData.code" clearable />
+          </t-form-item>
+        </t-col>
         <t-col :span="12">
           <t-form-item label="客户名称" name="name">
             <t-input v-model="formData.name" clearable />
@@ -109,6 +114,7 @@ const title = computed(() => {
 const { formData, isEdit } = useClearDialog(
   {
     id: null,
+    code: '',
     name: '',
     type: '',
     province: '',
@@ -131,7 +137,7 @@ const { formData, isEdit } = useClearDialog(
 );
 
 const rules = {
-  id: [{ required: true, message: 'ID必填', type: 'error', trigger: 'change' }],
+  code: [{ required: true, message: 'ID必填', type: 'error', trigger: 'change' }],
   name: [
     { required: true, message: '姓名必填', type: 'error', trigger: 'change' },
     {

+ 3 - 2
src/views/system/config-manage/customer-manage/index.vue

@@ -171,9 +171,10 @@ const params = reactive({
 });
 
 const columns = [
-  { colKey: 'id', title: '客户ID', width: 200 },
+  // { colKey: 'id', title: '客户ID', width: 200 },
+  { colKey: 'code', title: '客户ID', width: 200 },
   { colKey: 'name', title: '客户名称', width: 120 },
-  { colKey: 'code', title: '客户编号', width: 100 },
+  // { colKey: 'code', title: '客户编号', width: 100 },
   { colKey: 'type', title: '客户类型', cell: 'type', width: 120 },
   { colKey: 'province', title: '省份', width: 100 },
   { colKey: 'city', title: '城市', width: 100 },