2213980799@qq.com пре 1 година
родитељ
комит
bc59e16f83

+ 15 - 13
src/views/purchasingManage/producerManage/components/addContactDialog.vue

@@ -10,7 +10,7 @@
     @close="cancel"
   >
     <el-tabs v-model="activeName" type="card" @tab-click="handleActive">
-      <el-tab-pane label="基本信息" name="1">
+      <el-tab-pane label="基本信息" :name="1">
         <headerTitle title="基本信息" style="margin-top: 30px"></headerTitle>
         <el-form
           label-width="120px"
@@ -257,7 +257,7 @@
           </el-row>
         </el-form>
       </el-tab-pane>
-      <el-tab-pane label="银行信息" name="2">
+      <el-tab-pane label="银行信息" :name="2">
         <headerTitle title="银行信息" style="margin-top: 30px"></headerTitle>
         <ele-pro-table
           ref="table"
@@ -749,7 +749,7 @@ export default {
       certificateQualificationsDialogFlag: false,
       title: '',
       row: {},
-      activeName: '1',
+      activeName: 1,
       formDef,
       otherFormDef,
       form: copyObj(formDef),
@@ -1260,7 +1260,7 @@ export default {
       return new Promise((resolve, reject) => {
         this.$refs.form.validate((valid) => {
           if (!valid) {
-            this.activeName = '1';
+            this.activeName = 1;
             reject(false);
           } else {
             resolve(true);
@@ -1272,7 +1272,7 @@ export default {
       return new Promise((resolve, reject) => {
         this.$refs.otherForm.validate((valid) => {
           if (!valid) {
-            this.activeName = '4';
+            this.activeName = 4;
             reject(false);
           } else {
             resolve(true);
@@ -1283,7 +1283,7 @@ export default {
     tableLinkDataValid() {
       return new Promise((resolve, reject) => {
         if (this.tableLinkData.length == 0) {
-          this.activeName = '3';
+          this.activeName = 3;
           this.$message.error('联系人信息至少有1条');
           reject(false);
         } else {
@@ -1304,14 +1304,14 @@ export default {
         this.activeName -= 1;
       }
       if (type == 'next') {
-        if (this.activeName == '1' && !(await this.formValid())) {
+        if (this.activeName == 1 && !(await this.formValid())) {
           return;
         }
-        if (this.activeName == '3' && !(await this.tableLinkDataValid())) {
+        if (this.activeName == 3 && !(await this.tableLinkDataValid())) {
           this.$message.error('联系人信息至少有1条');
           return;
         }
-        if (this.activeName == '4' && !(await this.otherFormValid())) {
+        if (this.activeName == 4 && !(await this.otherFormValid())) {
           return;
         }
         this.activeName += 1;
@@ -1412,10 +1412,12 @@ export default {
               this.loading = false;
               this.$message.success('新增成功');
               this.cancel();
-              this._getById(id);
-              this.title = '编辑客户';
               this.$emit('done');
-              this.isUpdate = true;
+
+              // this._getById(id);
+              // this.title = '编辑客户';
+              // this.$emit('done');
+              // this.isUpdate = true;
             })
             .catch((e) => {
               //this.loading = false;
@@ -1427,7 +1429,7 @@ export default {
     },
     cancel() {
       this.$nextTick(() => {
-        this.activeName = '1';
+        this.activeName = 1;
         // 关闭后,销毁所有的表单数据
         this.$refs['otherForm'] && this.$refs['otherForm'].resetFields();
         this.$refs['formRef'] && this.$refs['formRef'].resetFields();

+ 3 - 3
src/views/saleManage/saleOrder/components/drawer.vue

@@ -18,7 +18,7 @@
         <span> 订单数量</span>
         <span class="value"
           >{{ orderNoCountData.saleOrderNumber }}
-          &nbsp;&nbsp;
+          &nbsp;&nbsp;
         </span>
       </div>
       <div>
@@ -39,14 +39,14 @@
         <span> 发货数量</span>
         <span class="value"
           >{{ orderNoCountData.sendNumber }}
-          &nbsp;&nbsp;
+          &nbsp;&nbsp;
         </span>
       </div>
       <div>
         <span> 退货数量</span>
         <span class="value"
           >{{ orderNoCountData.returnNumber }}
-          &nbsp;&nbsp;
+          &nbsp;&nbsp;
         </span>
       </div>
       <div>

+ 1 - 1
src/views/targetManage/salesTarget/index.vue

@@ -184,7 +184,7 @@ export default {
           slot: 'modelType',
           showOverflowTooltip: true,
           formatter: (row, column) => {
-            return row.enabled ? '进行中' : '已完成';
+            // return row.enabled ? '进行中' : '已完成';
           }
         },
         {