客户BUG

src/views/ecw/customer/components/customerMerge.vue

@@ -446,7 +446,7 @@ export default {
             customerIdSaved: this.retainCustomer.id
           }).then(_ => {
             this.$message.success(this.$t("操作成功"))
-            this.customerDialogVisible = false
+            this.dialogVisible = false
             this.$emit('refresh')
           })
         }

src/views/ecw/customer/edit.vue

@@ -164,6 +164,7 @@
               <el-form-item :label="$t('业绩类型')">
                 <el-switch
                   v-model="form.isNew"
+                  disabled
                   active-text="新客户"
                   inactive-text="老客户">
                 </el-switch>
@@ -855,7 +856,6 @@
                 />
               </el-form-item>
             </el-col>
-            
             <el-col :span="12">
               <el-form-item :label="$t('公司英文名称')">
                 <el-input
@@ -864,6 +864,22 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+             <el-col :span="12">
+              <el-form-item
+                v-hasPermi="['ecw:customer:edit-card']"
+                :label="$t('身份证号码')"
+              >
+                <el-input v-model="form.carNo"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item
+                v-hasPermi="['ecw:customer:edit-card']"
+                :label="$t('身份证姓名')"
+              >
+                <el-input v-model="form.carName"></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="12">
               <el-form-item :label="$t('结算方式')" prop="balance">
@@ -889,23 +905,6 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
-              <el-form-item
-                v-hasPermi="['ecw:customer:edit-card']"
-                :label="$t('身份证号码')"
-              >
-                <el-input v-model="form.carNo"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item
-                v-hasPermi="['ecw:customer:edit-card']"
-                :label="$t('身份证姓名')"
-              >
-                <el-input v-model="form.carName"></el-input>
-              </el-form-item>
-            </el-col>
-    
             <h3>{{$t('开票信息')}}</h3>
 
             <el-col :span="12">

src/views/ecw/customer/query.vue

@@ -683,15 +683,18 @@
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane name="financial" :label="$t('财务资料')">
+            <el-card class="box-card">
+              <div slot="header">{{$t('公司信息')}}</div>
               <el-descriptions :column="2">
                 <el-descriptions-item :label="$t('公司名称')">{{ customer.company }}</el-descriptions-item>
                 <el-descriptions-item :label="$t('公司英文名称')">{{ customer.companyEn }}</el-descriptions-item>
-              <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
                 <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证号码')">{{ customer.carNo }}</el-descriptions-item>
+                <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
                 <el-descriptions-item :label="$t('结算方式')">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_BALANCE, customer.balance) }}</el-descriptions-item>
                 <el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName  }}</el-descriptions-item>
               </el-descriptions>
-            <el-card class="box-card">
+            </el-card>
+            <el-card class="box-card" style="margin-top: 15px;">
               <div slot="header">{{$t('开票信息')}}</div>
               <el-descriptions :column="2">
                 <el-descriptions-item :label="$t('发票抬头')">{{ customer.invoiceTitle }}</el-descriptions-item>
@@ -1203,7 +1206,7 @@ export default {
   },
   filters: {
     deliveryRate(pickNum, sumNum) {
-      if (pickNum == 0) {
+      if (pickNum == 0 || sumNum == 0) {
         return 0
       } else if (pickNum && sumNum) {
         return Math.round(pickNum / sumNum * 10000) / 100 + "%"