Merge branch 'feature/dd-1796' into feature/0726-push-online

frontendEle/src/views/user/dec.vue

@@ -18,7 +18,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="报单中心编号">
-                    <el-input v-model="form.decUserName"></el-input>
+                    <el-input v-model="form.decUserName"  :disabled="true"></el-input>
                 </el-form-item>
 
 
@@ -239,14 +239,18 @@
     import Vue from 'vue'
     import network from '@/utils/network'
     import baseInfo from '@/utils/baseInfo'
+    import userInfo from '@/utils/userInfo'
     import store from '@/utils/vuexStore'
-     import tool from '@/utils/tool'
+    import tool from '@/utils/tool'
 
     export default {
         name: 'user_dec',
         mounted() {
             this.getData()
         },
+        created() {
+            this.getDecName()
+        },
         computed:{
             _tableData(){
                 if(this.tableData==null){
@@ -318,6 +322,9 @@
             }
         },
         methods: {
+            getDecName() {
+                this.form.decUserName = userInfo.userName()
+            },
             idcarChange() {
                 if (this.form.insertUserIdCard.length >= 6) {
                     this.form.payPassword = this.form.password = this.form.insertUserIdCard.substring(this.form.insertUserIdCard.length-6,this.form.insertUserIdCard.length);
@@ -337,15 +344,12 @@
                 console.log(this.sell_price_sum,this.price_pv_sum)
             },
             getData () {
-
                 network.getData(`user/dec`).then(response => {
-                    console.log(response)
                     this.loading = false;
                     this.form.insertUserName = response.userName;
                     this.allOpenBank = response.allOpenBank;
                     this.allDecPackage = response.allDecPackage;
                     this.allGoods = response.allGoods;
-                    console.log(this.allDecPackage);
                     let settingObj=this.allDecPackage;
                     let settingArr = Object.keys(settingObj).map(key => {
                         //console.log(key); //为每个键名
@@ -359,13 +363,8 @@
                     }
                      this.tableDatas=settingObj1;
                     // this.tableDatas=this.allGoods.map(item=>{return {...item,goodsNum:1}});
-
-                    console.log(this.tableDatas);
-                    console.log(this.numList);
                 }).catch(() => {
                 });
-
-
             },
             handleCurrentChange(val) {
                 console.log(val)