caojunjie 1 éve
szülő
commit
bf6615e6a1

BIN
src/file/newNews.mp3


+ 2 - 2
src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -1406,7 +1406,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode
@@ -1480,7 +1480,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode

+ 2 - 2
src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -1401,7 +1401,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode
@@ -1475,7 +1475,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode

+ 2 - 2
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -1436,7 +1436,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode
@@ -1510,7 +1510,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode

+ 2 - 2
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1447,7 +1447,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode
@@ -1521,7 +1521,7 @@
                 }else {
                     // 往来单位拿主表客户名称
                     obj.corpId = this.assemblyForm.corpId
-                    obj.corpCnName = this.assemblyForm.corpCnName
+                    obj.corpCnName = this.assemblyForm.corpCnName.split(' - ')[0]
                     obj.corpEnName = this.assemblyForm.corpEnName
                     // 预付/到付
                     obj.paymode = this.assemblyForm.mpaymode

+ 12 - 3
src/views/tirePartsMall/basicData/customerInformation/detailsPage.vue

@@ -583,6 +583,10 @@ export default {
               trigger: "blur"
             }
           ]
+        },{
+            label: '登录用户id',
+            prop: 'userId',
+            cell: true
         }, {
           label: '备注',
           prop: 'remarks',
@@ -724,6 +728,7 @@ export default {
             this.$message.success(
               "创建用户成功,默认帐号:手机号。默认密码:123456"
             );
+            this.getDetail(this.form.id)
           });
         } else {
           return false;
@@ -991,9 +996,13 @@ export default {
       console.log("row", row)
       if (row.id) {
         if (row.tel) {
-          this.dialogVisibleBt = true;
-          this.formDataTwo = {};
-          this.formRow = row;
+            if (!row.userId) {
+                this.dialogVisibleBt = true;
+                this.formDataTwo = {};
+                this.formRow = row;
+            }else {
+                this.$message.error("已经存在用户,请勿重复创建");
+            }
         } else {
           this.$message.error("请输入手机号");
         }

+ 6 - 4
src/views/tirePartsMall/inventory/index.vue

@@ -59,7 +59,7 @@ export default {
       treeData: [],
       loading: false,
       corpTypeVisible: false,
-      search: {whether:'0'},
+      search: {whether:'0',ifGrounding:'0'},
       form: {},
       dataList: [],
       stockSum:{}, // 合计数据
@@ -255,12 +255,14 @@ export default {
             type: 'select',
             dicData: [{
                 label: '未上架',
-                value: '1'
+                value: '0'
             }, {
                 label: '已上架',
-                value: '0'
+                value: '1'
             }],
-          },]
+            searchValue:'1',
+
+          }]
       }
     }
   },

+ 1 - 1
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -416,7 +416,7 @@ export default {
                 span: 8,
                 disabled: false,
                 column: [{
-                    label: '客户1',
+                    label: '客户',
                     prop: "customerName",
                     disabled: false,
                     formslot:true,