Merge branch 'feature/Feature-basic_data' of https://gogs.zfire.top/zfire-front/supply-front into feature/Feature-basic_data

src/views/supply/apply/components/apply_form.vue

@@ -247,7 +247,7 @@ export default {
     if(this.listItem) {
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
     }

src/views/supply/apply/components/engin_form.vue

@@ -370,7 +370,7 @@ export default {
     if(this.listItem) {
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
       this.mainForm.createDate = this.getDate();

src/views/supply/displace/components/displace_detail.vue

@@ -50,7 +50,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商编号</div>
-            <div class="value">{{detailData.customerId}}</div>
+            <div class="value">{{detailData.customerNumber}}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商名称</div>

src/views/supply/displace/components/displace_examine.vue

@@ -50,7 +50,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编号</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商名称</div>

src/views/supply/displace/components/displace_form.vue

@@ -463,7 +463,7 @@ export default {
       this.editId = this.listItem.displaceOrderId;
       this.getDetail();
     } else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
       this.mainForm.createDate = this.getDate();

src/views/supply/displace/components/displace_return.vue

@@ -50,7 +50,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编号</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商名称</div>

src/views/supply/engin/components/commerce_detail.vue

@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商编码</div>
-            <div class="value">{{detailData.customerId}}</div>
+            <div class="value">{{detailData.customerNumber}}</div>
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">经销商名称</div>

src/views/supply/engin/components/commerce_examine.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">经销商名称</div>

src/views/supply/engin/components/commerce_form.vue

@@ -409,7 +409,7 @@ export default {
       this.editId = this.listItem.parentId;
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
       this.mainForm.createDate = this.getDate();
@@ -465,7 +465,7 @@ export default {
         this.mainForm.orderNum = data.enginOrderId;
         this.mainForm.orderDate = data.orderDate;
         // this.mainForm.type = data.mainId;
-        this.mainForm.jxsNum = data.customerId;
+        this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.enginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;

src/views/supply/engin/components/commerce_return.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">经销商名称</div>

src/views/supply/engin/components/engin_detail.vue

@@ -18,7 +18,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">项目名称</div>

src/views/supply/engin/components/engin_examine.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">项目名称</div>

src/views/supply/engin/components/engin_form.vue

@@ -262,7 +262,7 @@ export default {
     if(this.listItem) {
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
       this.mainForm.createDate = this.getDate(0);
@@ -299,7 +299,7 @@ export default {
         this.mainForm.orderNum = data.enginInfoNo;
         this.mainForm.orderDate = data.orderDate;
         // this.mainForm.mainId = data.productCategoryId;
-        this.mainForm.jxsNum = data.customerId;
+        this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.enginName = data.projectName;
         this.mainForm.orderType = data.orderType;
         this.mainForm.jxsName = data.customerName;

src/views/supply/engin/components/home_detail.vue

@@ -23,7 +23,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">经销商编码</div>
-            <div class="value">{{detailData.customerId}}</div>
+            <div class="value">{{detailData.customerNumber}}</div>
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">经销商名称</div>

src/views/supply/engin/components/home_examine.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">经销商名称</div>

src/views/supply/engin/components/home_form.vue

@@ -423,7 +423,7 @@ export default {
       this.editId = this.listItem.parentId;
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
       this.mainForm.createDate = this.getDate();
@@ -489,7 +489,7 @@ export default {
         this.mainForm.orderNum = data.enginOrderId;
         this.mainForm.orderDate = data.orderDate;
         this.mainForm.type = data.mainId;
-        this.mainForm.jxsNum = data.customerId;
+        this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.refEnginRecordNo;
         this.mainForm.enginName = data.refProjectName;

src/views/supply/engin/components/home_return.vue

@@ -22,7 +22,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">经销商编码</div>
-          <div class="value">{{detailData.customerId}}</div>
+          <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">经销商名称</div>

src/views/supply/retail/components/retail_form.vue

@@ -351,7 +351,7 @@ export default {
     if(this.listItem) {
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
     }
   },
@@ -369,7 +369,7 @@ export default {
         this.mainForm.orderNum = data.id;
         this.mainForm.date = data.theTime.slice(0, 10);
         // this.mainForm.type = data.mainId;
-        this.mainForm.jxsNum = data.customerId;
+        this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.remark = data.remark;
         data.retailOrderItemList.forEach(item => {

src/views/supply/return/components/return_form.vue

@@ -242,7 +242,7 @@ export default {
     if(this.listItem) {
       this.getDetail();
     }else {
-      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerId;
+      this.mainForm.jxsNum = JSON.parse(localStorage.getItem("supply_user")).customerNumber;
       this.mainForm.jxsName = JSON.parse(localStorage.getItem("supply_user")).customerName;
       this.mainForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
     }