优化

src/benyun/components/byBill/byBill.vue

@@ -63,7 +63,7 @@
 						<i v-else class="el-icon-s-unfold"></i>
 					</div>
 				</div>
-				<el-drawer v-if="billConfig && billConfig.log" class="log-drawer" :size="600" append-to-body title="操作日志"
+				<el-drawer v-if="billConfig && billConfig.log" class="log-drawer" :size="600" @open="openLog" append-to-body title="操作日志"
 					:visible.sync="drawer" direction="rtl">
 					<byLog :propConfig="billConfig && billConfig.log" :parentValue="billValue" ref="log"  />
 				</el-drawer>
@@ -241,8 +241,8 @@
 					return
 				}
 				const blob = new Blob([res],{
-        type: "application/pdf;chartset=UTF-8"
-      })
+					type: "application/pdf;chartset=UTF-8"
+				})
 				const qrUrl:any =(window as any).URL.createObjectURL(blob);
 				const myWindow =(window as any).open(qrUrl);
 				myWindow.print();
@@ -258,14 +258,16 @@
 					this.billValue = (this.$refs.billForm as any).getValue();
 					this.drawer = true;
 				}
-				this.$forceUpdate();
+			})
+		}
+		openLog(){
+			this.$nextTick(() => {
 				if (this.$refs.log) {
 					(this.$refs.log as any).setBillValue(this.billValue);
 					(this.$refs.log as any).request();
 				}
 			})
 		}
-
 		setConfigAfter() {
 			if (this.attrs.activeName) {
 				this.showTab = this.attrs.activeName

src/benyun/utils/request.ts

@@ -17,7 +17,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 30000
+  timeout: 60000
 })
 
 // request拦截器

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

@@ -370,6 +370,8 @@ export default class BatchbyOneModal extends Vue {
           it.state = s;
           if(msg){
             it.msg = msg;
+          }else{
+            it.msg = '';
           }
           break;
         }

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

@@ -45,12 +45,12 @@
         <el-dropdown-item command="updateSalesman">设定业务员</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <el-button type="text" @click="handle('producePurchase')" title="选取已提交数据">生成采购单</el-button>
+    <el-button type="text" @click="handle('producePurchase')" title="选取已审核数据">生成采购单</el-button>
     <el-button type="text" @click="handle('orderFile')">订单归档</el-button>
     <div class="split"></div>
-    <el-button type="text" @click="handle('autoMerge')">自动合并<i class="el-icon-info" title="自动合并条件：已付款，已提交，同一个买家/分销商，同一个发货地址，未合并，未拆分"></i></el-button>
-    <el-button type="text" @click="handle('autoSplit')">自动拆分<i class="el-icon-info" title="自动拆分条件：已付款，已提交，未合并"></i></el-button>
-    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已提交，待付款，已付款待审核"></i></el-button>
+    <el-button type="text" @click="handle('autoMerge')">自动合并<i class="el-icon-info" title="自动合并条件：已付款，已审核，同一个买家/分销商，同一个发货地址，未合并，未拆分"></i></el-button>
+    <el-button type="text" @click="handle('autoSplit')">自动拆分<i class="el-icon-info" title="自动拆分条件：已付款，已审核，未合并"></i></el-button>
+    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已审核，待付款，已付款待审核"></i></el-button>
   </div>
 </template>
 

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

@@ -46,10 +46,10 @@
         <el-dropdown-item command="updateSalesman">设定业务员</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <el-button type="text" @click="handle('producePurchase')" title="选取已提交数据">生成采购单</el-button>
+    <el-button type="text" @click="handle('producePurchase')" title="选取已审核数据">生成采购单</el-button>
     <el-button type="text" @click="handle('orderFile')">订单归档</el-button>
     <div class="split"></div>
-    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已提交，待付款，已付款待审核"></i></el-button>
+    <el-button type="text" @click="handle('batchSendGoods')">发货<i class="el-icon-info" title="发货条件：已审核，待付款，已付款待审核"></i></el-button>
   </div>
 </template>
 

src/views/oms/jushuitanOrder/compoments/sendGoods.vue

@@ -19,7 +19,7 @@
       <vxe-column field="warehouseCode" title="仓库编码" width="150"> </vxe-column>
       <vxe-column field="orderFlag" title="订单标记" width="150"> </vxe-column>
       <vxe-column field="sourcePlatformCode" title="订单来源平台编码" width="150"> </vxe-column>
-      <vxe-column field="shopNick" title="店铺名称" width="140"> </vxe-column>
+      <vxe-column field="shopNick" title="店铺名称" width="170"> </vxe-column>
       <vxe-column field="totalAmount" title="订单总金额" width="140"> </vxe-column>
       <vxe-column field="itemAmount" title="商品总金额(元)" width="140"> </vxe-column>
       <vxe-column title="操作" width="120" fixed="right" align="center">