Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

lms/nladmin-ui/src/views/monitor/server/index.vue

@@ -24,7 +24,7 @@
           <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
             <div class="title">CPU使用率</div>
             <el-tooltip placement="top-end">
-              <div slot="content" style="font-size: 12px;">
+              <div slot="content" style="font-size: 12px;">CPU使用率
                 <div style="padding: 3px;">
                   {{ data.cpu.name }}
                 </div>
@@ -249,7 +249,6 @@ export default {
   }
 }
 </script>
-
 <style rel="stylesheet/scss" lang="scss" scoped>
  ::v-deep .box-card {
     margin-bottom: 5px;

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -651,6 +651,7 @@ export default {
       this.loadingSetAllPoint = true
       this.currentRow.point_code = this.form2.point_code
       this.currentRow.checked = this.checked
+      this.currentRow.stor_id = this.mstrow.stor_id
       checkoutbill.allSetPoint(this.currentRow).then(res => {
         this.queryTableDdis(this.currentRow.iostorinvdtl_id)
         this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)