Merge remote-tracking branch 'origin/master'

mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue

@@ -90,6 +90,17 @@
         >
           手工分配
         </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          :loading="loadingSetAllPoint"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          @click="setPointAll"
+        >
+          一键设置
+        </el-button>
       </span>
     </div>
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -466,6 +477,17 @@ export default {
         this.loadingSetAllPoint = false
       })
     },
+    setPointAll() {
+      this.loadingSetAllPoint = true
+      productOut.setPointAll(this.mstrow).then(res => {
+        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.queryTableDtl()
+        this.tabledis = []
+        this.form2.point_code = ''
+      }).finally(() => {
+        this.loadingSetAllPoint = false
+      })
+    },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       const assign_qty = parseFloat(row.assign_qty)
       const plan_qty = parseFloat(row.plan_qty)

mes/qd/src/views/wms/storage_manage/product/productOut/productout.js

@@ -64,6 +64,14 @@ export function setPoint(data) {
   })
 }
 
+export function setPointAll(data) {
+  return request({
+    url: 'api/productOut/setPointAll',
+    method: 'post',
+    data
+  })
+}
+
 export function confirm(data) {
   return request({
     url: 'api/productOut/confirm',
@@ -129,6 +137,7 @@ export default {
   allDivIvt,
   allCancel,
   setPoint,
+  setPointAll,
   confirm,
   getStructIvt,
   manualDiv,