修改bug

.env.production

@@ -10,6 +10,6 @@ VUE_APP_BASE_API = '/prod-api'
 # 登录地址 正式
 # VUE_APP_LOGIN_URL = 'https://sso.lzlxylsf.com/#/'
 # 开发
-# VUE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
+VUE_APP_LOGIN_URL = 'https://sso.benyuntech.com/#/'
 # 测试
-VUE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth'
+# VUE_APP_LOGIN_URL = 'https://ssotest.benyuntech.com/#/sso/auth'

src/views/audit/outbound/index.vue

@@ -903,6 +903,7 @@
 						return newData
 					})
 					let billConfig = (this as any).$lodash.cloneDeep(this.config.bill);
+					
 					if (billConfig.tableConfig[0].table.columns.at(-1).title != '操作') {
 						billConfig.tableConfig[0].table.columns.push({
 							width: 90,
@@ -920,6 +921,31 @@
 							}]
 						})
 					};
+					billConfig.tableConfig[0].table.columns[8] = {
+						width: 120,
+						title: '数量',
+						field: 'number',
+						component: 'by-input',
+						compConfig: {
+							attr: {
+								size: 'mini',
+								type: 'number',
+								defaultValue: 1,
+							},
+						}
+					};
+					billConfig.tableConfig[0].table.columns[11] = {
+						width: 90,
+						title: '单价',
+						field: 'unitPrice',
+						component: 'by-input',
+						compConfig: {
+							attr: {
+								size: 'mini',
+								type: 'number',
+							},
+						}
+					};
 					parentData[0].suborderList = parentData[0].suborderList.filter((v : any) => (v.number - v.outNumber) > 0);
 					parentData[0].suborderList.map((v : any) => {
 						v.deliveryNumber = v.number - v.outNumber;
@@ -933,6 +959,7 @@
 					(this.$refs.bill as any).showTab = 'bill';
 					loading.close();
 					setTimeout(() => {
+						billConfig.form.attr.readonly = false;
 						(this.$refs.bill as any).setBillConfig(billConfig);
 						(this.$refs.bill as any).setBillFormValue(parentData[0]); // 设置单据表单数据
 						(this.$refs.bill as any).setBillTableValue(parentData[0].suborderList, 0);// 设置第1张单据表格数据
@@ -1107,7 +1134,7 @@
 								}]
 							})
 						};
-						billConfig.tableConfig[0].table.columns[7] = {
+						billConfig.tableConfig[0].table.columns[8] = {
 							width: 120,
 							title: '数量',
 							field: 'number',
@@ -1120,7 +1147,7 @@
 								},
 							}
 						};
-						billConfig.tableConfig[0].table.columns[10] = {
+						billConfig.tableConfig[0].table.columns[11] = {
 							width: 90,
 							title: '单价',
 							field: 'unitPrice',
@@ -1218,12 +1245,12 @@
 				if (parentData.submitState === 1) readonly.tool.tools = { return: true, returnSmt: true, print: true };
 			}
 			readonly.tableConfig[0].table.columns = readonly.tableConfig[0].table.columns.filter((v : any) => v.title != '操作');
-			readonly.tableConfig[0].table.columns[7] = {
+			readonly.tableConfig[0].table.columns[8] = {
 				width: 120,
 				title: '数量',
 				field: 'number',
 			};
-			readonly.tableConfig[0].table.columns[10] = {
+			readonly.tableConfig[0].table.columns[11] = {
 				width: 90,
 				title: '单价',
 				field: 'unitPrice',

src/views/audit/warehousing/index.vue

@@ -941,7 +941,7 @@
 								}]
 							})
 						};
-						billConfig.tableConfig[0].table.columns[5] = {
+						billConfig.tableConfig[0].table.columns[6] = {
 							width: 120,
 							title: '数量',
 							field: 'number',
@@ -954,7 +954,7 @@
 								},
 							}
 						};
-						billConfig.tableConfig[0].table.columns[7] = {
+						billConfig.tableConfig[0].table.columns[8] = {
 							width: 90,
 							title: '单价',
 							field: 'unitPrice',

src/views/oms/B2BOrder/components/addOrder.vue

@@ -511,7 +511,7 @@ export default class AddOrder extends Vue {
       [{
         span:8,
         label:'手机',
-        colspan: 1,
+        colspan: 2,
         prop:'receiverMobile',
         component:'by-input',
         compConfig:{
@@ -1478,7 +1478,7 @@ export default class AddOrder extends Vue {
       this.totalNum();
       if(names){
         let name = isGift ? '赠品' : '商品';
-        this.$alert(name+'“'+names+'”已存在，请在列表做调整！', '提示', {
+        this.$alert(name+'“'+names+'”已存在，请在列表中做调整！', '提示', {
           confirmButtonText: '确定',
           callback: action => {}
         });

src/views/oms/B2BOrder/components/batchbyOneModal.vue

@@ -114,7 +114,7 @@ export default class BatchbyOneModal extends Vue {
         const requestId =  new Date().getTime() + this.getUuid()
         let obj:any={
           tmsTransportMethod:'零担',
-          tmsBusinessMan: (this as any).$store.getters.userInfo.userName,
+          tmsBusinessMan: (this as any).$store.getters.userInfo.nickName,
           tmsBusinessPhone: (this as any).$store.getters.userInfo.phonenumber,
           requestId:requestId,
           omsOrderIds:item.id,

src/views/oms/B2BOrder/components/carpoolModal.vue

@@ -65,7 +65,7 @@ export default class CarpoolModal extends Vue {
     this.data =data;
     this.value={};
     this.value.tmsTransportMethod = '整车';
-    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.userName;
+    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.nickName;
     this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
     this.value.subItem=[];
     this.value.weight = data[0].weight;

src/views/oms/B2BOrder/components/deliveryDetail.vue

@@ -222,6 +222,7 @@ export default class DeliveryDetail extends Vue {
           }
         },1000)
       }else{
+        this.drawer = false;
         this.$message('未找到发货明细数据！')
       }
     }).catch(() => {

src/views/oms/B2COrder/components/deliveryDetail.vue

@@ -149,35 +149,39 @@ export default class DeliveryDetail extends Vue {
       omsOrderId:v
     }).then((res:any) => {
       this.value = res.data;
-      if(res.data.subItemList){
-        this.value.subItem=[];
-        for(const item of this.value.subItemList){
-          this.value.subItem.push({
-            tmsGoodsCode:item.tmsGoodsCode,
-            name:item.tmsGoodsName,
-            tmsGoodsTotalPrice:item.tmsGoodsTotalPrice,
-            price:item.tmsGoodsPrice,
-            weight:item.tmsWeight,
-            tmsQuantity:item.tmsQuantity
-          })
+      if(this.value) {
+        if(res.data.subItemList){
+          this.value.subItem=[];
+          for(const item of this.value.subItemList){
+            this.value.subItem.push({
+              tmsGoodsCode:item.tmsGoodsCode,
+              name:item.tmsGoodsName,
+              tmsGoodsTotalPrice:item.tmsGoodsTotalPrice,
+              price:item.tmsGoodsPrice,
+              weight:item.tmsWeight,
+              tmsQuantity:item.tmsQuantity
+            })
+          }
         }
-      }
-      this.load = false;
-      if(res.data.pricePlan){
-        try{
-          this.priceData = JSON.parse(res.data.pricePlan);
-        }catch(e){
-          this.priceData = [];
-          console.error('价格列表数据转换错误！')
+        this.load = false;
+        if(res.data.pricePlan){
+          try{
+            this.priceData = JSON.parse(res.data.pricePlan);
+          }catch(e){
+            this.priceData = [];
+            console.error('价格列表数据转换错误！')
+          }
+          
         }
-        
+        setTimeout(()=>{
+          if(this.$refs.info){
+            (this.$refs.info as any).setValue(this.value)
+          }
+        },1000)
+      }else{
+        this.drawer = false;
+        this.$message('未找到发货明细数据！')
       }
-      setTimeout(()=>{
-        if(this.$refs.info){
-          (this.$refs.info as any).setValue(this.value)
-        }
-      },1000)
-      
     }).catch(() => {
       this.load = false;
     })

src/views/oms/shop/index.vue

@@ -19,79 +19,99 @@ export default class Shop extends Vue {
     attr:{
       calculateH:true
     },
-    search:{
-      attr:{
-        size:'small'
-      },
-      columns:[
-        [{
-          label:'店铺名称',
-          prop:'shopName',
-          component:'by-input',
-          compConfig:{}
-        },{
-          label:'店铺简称',
-          prop:'shortName',
-          component:'by-input',
-          compConfig:{}
-        },
-        // {
-        //   label:'店铺状态',
-        //   prop:'shopStatus',
-        //   component:'by-input',
-        //   compConfig:{}
-        // },
-        {
-          label:'授权状态',
-          prop:'authStatus',
-          component:'by-select',
-          compConfig:{
-            attr:{
-              clearable:true,
-              data:[{
-                value:'Authorized',
-                label:'已授权'
-              },{
-                value:'Unauthorized',
-                label:'未授权'
-              },{
-                value:'Expired',
-                label:'已过期'
-              }]
-            }
-          }
-        }],
-        [{
-          label:'授权账号',
-          prop:'authAccount',
-          component:'by-input',
-          compConfig:{}
-        },{
-          label:'所属平台',
-          prop:'channelName',
-          component:'by-input',
-          compConfig:{}
-        },
-        // {
-        //   label:'同步发货',
-        //   prop:'enableSyncSend',
-        //   component:'by-input',
-        //   compConfig:{}
-        // },
-        {
-          label:'创建时间',
-          prop:'createTime',
-          component:'by-date-picker',
-          compConfig:{
-            attr:{
-              editable:false,
-              type:'datetimerange',
-              format:'yyyy-MM-dd HH:mm:ss'
-            }
-          }
-        }]
-      ]
-    },
+    // search:{
+    //   attr:{
+    //     size:'small'
+    //   },
+    //   columns:[
+    //     [{
+    //       label:'店铺名称',
+    //       prop:'shopName',
+    //       component:'by-input',
+    //       compConfig:{}
+    //     },{
+    //       label:'店铺类型',
+    //       prop:'shortName',
+    //       component:'by-input',
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'店铺编码',
+    //       prop:'shopStatus',
+    //       component:'by-input',
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'类型',
+    //       prop:'authStatus',
+    //       component:'by-select',
+    //       compConfig:{
+    //         attr:{
+    //           clearable:true,
+    //           data:[{
+    //             value:'Authorized',
+    //             label:'已授权'
+    //           },{
+    //             value:'Unauthorized',
+    //             label:'未授权'
+    //           },{
+    //             value:'Expired',
+    //             label:'已过期'
+    //           }]
+    //         }
+    //       }
+    //     }],
+    //     [{
+    //       label:'授权状态',
+    //       prop:'authStatus',
+    //       component:'by-select',
+    //       compConfig:{
+    //         attr:{
+    //           clearable:true,
+    //           data:[{
+    //             value:'Authorized',
+    //             label:'已授权'
+    //           },{
+    //             value:'Unauthorized',
+    //             label:'未授权'
+    //           },{
+    //             value:'Expired',
+    //             label:'已过期'
+    //           }]
+    //         }
+    //       }
+    //     },{
+    //       label:'子平台名称',
+    //       prop:'channelName',
+    //       component:'by-input',
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'联系人',
+    //       prop:'enableSyncSend',
+    //       component:'by-input',
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'联系人电话',
+    //       prop:'enableSyncSend',
+    //       component:'by-input',
+    //       compConfig:{}
+    //     },
+    //     {
+    //       label:'创建时间',
+    //       prop:'createTime',
+    //       component:'by-date-picker',
+    //       compConfig:{
+    //         attr:{
+    //           editable:false,
+    //           type:'datetimerange',
+    //           format:'yyyy-MM-dd HH:mm:ss'
+    //         }
+    //       }
+    //     }]
+    //   ]
+    // },
     tool:{
       tools:{
         add:true,
@@ -111,9 +131,9 @@ export default class Shop extends Vue {
         title:'店铺名称',
         field:'shopName',
         isDetail:true,
-        // width:150
+        width:150
       },{
-        title:'店铺简称',
+        title:'店铺类型',
         field:'shortName',
         width:150
       },
@@ -131,36 +151,39 @@ export default class Shop extends Vue {
       //   width:150
       // },
       {
-        title:'公司编号',
+        title:'类型',
         field:'companyCode',
         width:150
       },{
-        title:'所属平台',
+        title:'平台名称',
         field:'channelName',
         width:150
       },{
-        title:'平台店铺名称',
+        title:'子平台名称',
         field:'channelShopName',
         width:150
-      },{
-        title:'授权账户',
-        field:'authAccount',
-        width:150
-      },{
+      },
+      // {
+      //   title:'授权账户',
+      //   field:'authAccount',
+      //   width:150
+      // },
+      {
         title:'授权状态',
         field:'authStatus',
         width:150,
         component:shopTag
       },
-      // {
-      //   title:'授权开始时间',
-      //   field:'authBegin',
-      //   width:150
-      // },{
-      //   title:'授权过期时间',
-      //   field:'authExpired',
-      //   width:150
-      // },{
+      {
+        title:'联系人',
+        field:'authBegin',
+        width:150
+      },{
+        title:'联系电话',
+        field:'authExpired',
+        width:150
+      },
+      //{
       //   title:'授权修改时间',
       //   field:'authModified',
       //   width:150