feat: 术士套包嵌入单据页面

src/api/inout/receiveOrder.js

@@ -18,6 +18,13 @@ export function addDetail(query) {
     data: query
   });
 }
+export function addWarlockBag(query) {
+  return axios({
+    url: "/udiwms/receive/detail/addWarlockBag",
+    method: "post",
+    data: query
+  });
+}
 
 export function repeatAdd(query) {
   return axios({

src/api/purchase/purApply.js

@@ -95,6 +95,15 @@ export function addApplyDetail(data) {
   })
 }
 
+// 添加pur
+export function addDetailByWarlockBag(data) {
+  return request({
+    url: "/purchase/apply/addDetailByWarlockBag",
+    method: 'post',
+    data: data
+  })
+}
+
 // 添加app
 export function addApplyId() {
   return request({

src/api/purchase/purOrder.js

@@ -93,6 +93,15 @@ export function addOrderId() {
   })
 }
 
+// 添加puan
+export function addOrderDetailByWarlockBag(data) {
+  return request({
+    url: "/purchase/order/addDetailByWarlockBag",
+    method: 'post',
+    data: data
+  })
+}
+
 // 根据申购单添加详情表
 export function addPlanDetailAndOrder(data) {
   return request({

src/api/purchase/purPlan.js

@@ -102,6 +102,15 @@ export function addPlanId() {
   })
 }
 
+// 添加puan
+export function addPlanDetailByWarlockBag(data) {
+  return request({
+    url: "/purchase/plan/addDetailByWarlockBag",
+    method: 'post',
+    data: data
+  })
+}
+
 // 根据申购单添加详情表
 export function addPlanDetailAndApply(data) {
   return request({

src/views/basic/destiny/warlockBagModel.vue

@@ -125,17 +125,16 @@
 
 <script>
 import {
-  addModeldestiny,
-  delectModeldestiny,
   filterDestinyDelect,
   getBasicDestinyfilter
 } from "@/api/basic/basicDestinyRel";
-import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
-import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
-import {isBlank} from "@/utils/strUtil";
-import {
-  addWarlockBagProduct
-} from "@/api/inout/orderDetailCode";
+import { addWarlockBagProduct } from "@/api/inout/orderDetailCode";
+import {  addWarlockBag } from "@/api/inout/receiveOrder";
+import {  addDetailByWarlockBag } from "@/api/purchase/purApply";
+import {  addOrderDetailByWarlockBag } from "@/api/purchase/purOrder";
+import {  addPlanDetailByWarlockBag } from "@/api/purchase/purPlan";
+
+
 
 export default {
   props: {
@@ -143,6 +142,18 @@ export default {
       type: Object,
       required: true,
     },
+    pId: {
+      type: Object,
+      required: true,
+    },
+    type: {
+      type: Number,
+      required: true,
+    },
+    codeArray: {
+      type: Array,
+      required: true,
+    },
     closeDialog: {
       type: Function,
       required: true,
@@ -256,23 +267,96 @@ export default {
         this.$message.error('未选择术士套包');
         return;
       }
-      let CQuery = {
-        id: this.currentRow.id,
-        orderEntity: this.data
-      }
-      // console.log(CQuery)
-      addWarlockBagProduct(CQuery).then((response) => {
-        this.loading = false;
-        if (response.code === 20000) {
-          this.closeDialog(response.data);
-        } else {
-          this.$message.error(response.message);
+
+      if (this.type == 1 ){//新增领用单
+        let CQuery = {
+          purReceiveEntity: this.data,
+          bagId: this.currentRow.id
         }
-      }).catch(() => {
+        addWarlockBag(CQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        }).catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+
+      }else if ( this.type == 2){//新增业务单据
+        let CQuery = {
+          id: this.currentRow.id,
+          orderEntity: this.data
+        }
+        addWarlockBagProduct(CQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        }).catch(() => {
           this.loading = false;
           this.dataList = [];
           this.pageTotal = 0;
         });
+      }else if ( this.type == 3) {//新增申购单据
+        let CQuery = {
+          bagId: this.currentRow.id,
+          orderIdFk: this.pId
+        }
+        addDetailByWarlockBag(CQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        }).catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+
+      }else if ( this.type == 4) {//新增采购计划
+        let CQuery = {
+          bagId: this.currentRow.id,
+          orderIdFk: this.pId
+        }
+        addPlanDetailByWarlockBag(CQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        }).catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+      }else if ( this.type == 5) {//新增采购订单
+        let CQuery = {
+          bagId: this.currentRow.id,
+          orderIdFk: this.pId
+        }
+        addOrderDetailByWarlockBag(CQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            this.$message.error(response.message);
+          }
+        }).catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+      }
+
     },
     handleChange(val) {
       this.radio = val.id;

src/views/inout/PanelCreateOrderBizDetail.vue

@@ -133,6 +133,7 @@
       <selectWarlockBag
         :closeDialog="closeDialog"
         :data="thisData"
+        :type="2"
       ></selectWarlockBag>
     </el-dialog>
 

src/views/inout/receive/DialogNewReceive.vue

@@ -104,16 +104,25 @@
         </el-row>
       </el-card>
       <el-card>
-        <el-button-group style="display: flex">
-          <el-button
-            type="primary"
-            @click.native.stop="selectProductFunction()"
-            style="margin: 0px 60px 10px auto; height: 35px"
-            :loading="loading"
-          >产品录入
-          </el-button
-          >
-        </el-button-group>
+        <el-row>
+          <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
+            <el-button-group>
+            <el-button
+              type="primary"
+              @click.native.stop="selectWarlockBagFunction()"
+              :loading="loading"
+            >术士套包录入
+            </el-button>
+            <el-button
+              type="primary"
+              @click.native.stop="selectProductFunction()"
+              :loading="loading"
+            >产品录入
+            </el-button
+            >
+            </el-button-group>
+          </div>
+        </el-row>
         <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                   :row-class-name="tableRowClassName"
                   border
@@ -159,6 +168,23 @@
     </el-form>
 
 
+    <el-dialog
+      title="业务详情-术士套包录入"
+      :visible.sync="selectWarlockBagVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectWarlockBagVisible"
+      :append-to-body='true'
+    >
+      <selectWarlockBag
+        :closeDialog="closeDialogC2"
+        :data="formData"
+        :codeArray="codeArray"
+        :type="1"
+      ></selectWarlockBag>
+    </el-dialog>
+
     <el-dialog
       title="库存物资录入"
       :visible.sync="selectInvProductVisible"
@@ -186,6 +212,7 @@ import dialogInvProduct from "../DialogSelectInvProduct";
 import {addDetail, getOrderDetail, repeatAdd} from "@/api/inout/receiveOrder";
 import {parseTime} from "@/utils/coTools";
 import {listApplyDetail} from "@/api/purchase/purApply";
+import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 
 export default {
   name: "idQuery",
@@ -269,6 +296,7 @@ export default {
       currentRow: {},
       selectedIndex: null,
       selectInvProductVisible: false,
+      selectWarlockBagVisible: false,
       thisData: {},
       storageList: [],
       invQueryData: {},
@@ -279,7 +307,7 @@ export default {
     };
   },
   components: {
-    dialogInvProduct
+    dialogInvProduct,selectWarlockBag
   },
   methods: {
     //当前分库
@@ -424,10 +452,23 @@ export default {
     },
     closeDialogC2(rData) {
       this.selectInvProductVisible = false;
+      this.selectWarlockBagVisible = false;
       this.formData.billNo = rData;
       this.getOrderDetailList();
 
     },
+    selectWarlockBagFunction(event) {
+
+      if (this.formData.targetInvCode == null) {
+        this.$message.error("往来信息为空！");
+        return;
+      }
+
+      if (this.$isBlank(event)) {
+        this.selectWarlockBagVisible = true;
+      }
+    },
+
     save() {
       if (this.$isNotBlank(this.Receive)) {
         this.Receive.targetInvCode = this.formData.targetInvCode

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -96,6 +96,12 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+              <el-button
+                type="primary"
+                @click.native.stop="selectWarlockBagFunction()"
+                :loading="loading"
+              >术士套包录入
+              </el-button>
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
               </el-button>
               <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>-->
@@ -140,6 +146,25 @@
       </el-card>
     </el-form>
 
+
+    <el-dialog
+      title="术士套包录入"
+      :visible.sync="selectWarlockBagVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectWarlockBagVisible"
+      :append-to-body='true'
+    >
+      <selectWarlockBag
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :codeArray="codeArray"
+        :pId="pId"
+        :type="3"
+      ></selectWarlockBag>
+    </el-dialog>
+
     <el-dialog
       title="产品录入"
       :visible.sync="selectProductVisible"
@@ -192,6 +217,7 @@ import {filterGroupBySpuse, filterSubByInv} from "@/api/system/invSubWarehouse";
 import {addPlanId} from "@/api/purchase/purPlan";
 import SelectRecelveListDialog from "@/views/inout/receive/selectReveiceListDialog";
 import {parseTime} from "@/utils/coTools";
+import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 
 export default {
   name: "idQuery",
@@ -267,6 +293,7 @@ export default {
       currentRow: {},
       selectedIndex: "",
       selectProductVisible: false,
+      selectWarlockBagVisible: false,
       thisData: {},
       storageList: [],
       subInvList: [],
@@ -282,7 +309,8 @@ export default {
   components: {
     draggable,
     purApplyProducts,
-    SelectRecelveListDialog
+    SelectRecelveListDialog,
+    selectWarlockBag
   },
   methods: {
     saveOrder(status) {
@@ -383,9 +411,30 @@ export default {
 
       this.selectProductVisible = true;
 
+    },
+    selectWarlockBagFunction() {
+      this.$nextTick(res => {
+        //当父id为空的时候生成id
+        if (this.pId == null) {
+          addApplyId().then(response => {
+            if (response.code === 20000) {
+              this.pId = response.data
+              console.log("生成id:")
+              console.log(this.pId)
+            }
+          }).catch(() => {
+            this.loading = false;
+          })
+        }
+        this.thisData.stockOrderLists = this.codeArray;
+      })
+
+      this.selectWarlockBagVisible = true;
+
     },
     closeDialogC2(rData) {
       this.selectProductVisible = false;
+      this.selectWarlockBagVisible = false;
       this.selectApplyVisible = false;
       this.query = {
         orderIdFk: rData
@@ -405,6 +454,9 @@ export default {
         });
     },
     rowChange(val) {
+      if (this.currentRow != null){
+        updateDetail(this.currentRow);
+      }
       this.currentRow = val;
       this.selectedIndex = val.index;
 

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -127,6 +127,12 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+              <el-button
+                type="primary"
+                @click.native.stop="selectWarlockBagFunction()"
+                :loading="loading"
+              >术士套包录入
+              </el-button>
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
               </el-button>
               <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->
@@ -148,7 +154,6 @@
               <el-input size="small" v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
-                        @change="tableCountChange(scope.row)"
                         :disabled="scope.row.index !== selectedIndex"
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
@@ -158,7 +163,6 @@
           <el-table-column label="供应商" prop="supName">
             <template slot-scope="scope">
               <el-select size="mini"
-                         @change='tableCountChange(scope.row)'
                          v-model="scope.row.supName" clearable
                          :disabled="scope.row.index !== selectedIndex"
                          placeholder="请选择">
@@ -175,6 +179,9 @@
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
               </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                         @click.native="tableCountChange(scope.row)">保存
+              </el-button>
               <el-button type="text" size="small" @click.stop="true"
                          @click.native="deleteCodeArray(scope.$index, scope.row)">删除
               </el-button>
@@ -184,6 +191,23 @@
       </el-card>
     </el-form>
 
+    <el-dialog
+      title="术士套包录入"
+      :visible.sync="selectWarlockBagVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectWarlockBagVisible"
+      :append-to-body='true'
+    >
+      <selectWarlockBag
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :codeArray="codeArray"
+        :pId="pId"
+        :type="5"
+      ></selectWarlockBag>
+    </el-dialog>
     <el-dialog
       title="物资录入"
       :visible.sync="selectProductVisible"
@@ -236,6 +260,7 @@ import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
 import {parseTime} from "@/utils/coTools";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 
 export default {
   name: "idQuery",
@@ -302,6 +327,7 @@ export default {
       currentRow: {},
       selectedIndex: "",
       selectProductVisible: false,
+      selectWarlockBagVisible: false,
       thisData: {},
       storageList: [],
       invCodeList: [],
@@ -319,7 +345,8 @@ export default {
   components: {
     draggable,
     purOrderProducts,
-    SelectPlanListDialog
+    SelectPlanListDialog,
+    selectWarlockBag
   },
   methods: {
     saveOrder(status) {
@@ -331,7 +358,6 @@ export default {
             return;
           }
           if (status === '2') {
-
             if (this.formData.createTime == "" || this.formData.createTime == null) {
               return this.$message.error("单据日期不能为空！");
             }
@@ -357,6 +383,26 @@ export default {
             }
           }
           if (status == "1") {
+            if (this.formData.createTime == "" || this.formData.createTime == null) {
+              return this.$message.error("单据日期不能为空！");
+            }
+            if (this.formData.invCode == "" || this.formData.invCode == null) {
+              return this.$message.error("采购仓库不能为空！");
+            }
+            if (this.formData.emergency == "" || this.formData.emergency == null) {
+              return this.$message.error("紧急程度不能为空！");
+            }
+            if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
+              return this.$message.error("到货时间不能为空！");
+            }
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
+              if (this.$isBlank(this.codeArray[i].supName)) {
+                return this.$message.error('请选择产品对应供应商');
+              }
+            }
             this.submitFunction(status);
           } else {
             let tip = "是否确定提交订单?";
@@ -411,11 +457,26 @@ export default {
       }
       this.thisData.stockOrderLists = this.codeArray;
     },
+    selectWarlockBagFunction() {
+      this.selectWarlockBagVisible = true;
+      //当父id为空的时候生成id
+      if (this.pId == null) {
+        addOrderId().then(response => {
+          if (response.code === 20000) {
+            this.pId = response.data
+          }
+        }).catch(() => {
+          this.loading = false;
+        })
+      }
+      this.thisData.stockOrderLists = this.codeArray;
+    },
     setDeptCode(obj) {
       this.formData.deptCode = this.invCodeList.find(item => item.code == obj).parentId;
     },
     closeDialogC2() {
       this.selectProductVisible = false;
+      this.selectWarlockBagVisible = false;
       this.selectApplyVisible = false;
       this.query = {
         orderIdFk: this.pId
@@ -433,6 +494,9 @@ export default {
         });
     },
     rowChange(val) {
+      if (this.currentRow != null){
+        updateDetail(this.currentRow);
+      }
       this.currentRow = val;
       this.selectedIndex = val.index;
       filterSupList({productId: val.productId}) //查找该单号下的所有条码
@@ -447,6 +511,7 @@ export default {
       if (this.$isNotBlank(row)) {
         this.currentRow.supId= this.suppliers.find(item => item.name == row.supName).erpId
         updateDetail(this.currentRow);
+        this.selectedIndex = ""
       }
     },
     tableRowClassName({row, rowIndex}) {

src/views/purchase/purPlan/purPlanEditDialog.vue

@@ -94,6 +94,12 @@
         <el-row type="flex" justify="end">
           <el-button-group style="display: flex">
             <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+              <el-button
+                type="primary"
+                @click.native.stop="selectWarlockBagFunction()"
+                :loading="loading"
+              >术士套包录入
+              </el-button>
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
 <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>-->
             </el-button-group>
@@ -111,7 +117,6 @@
               <el-input size="small" v-model="scope.row.count"
                         placeholder="请输入数量" style="width: 80%"
                         type='number'
-                        @change="tableCountChange(scope.row)"
                         :disabled="scope.row.index !== selectedIndex"
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
@@ -124,6 +129,9 @@
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
               </el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                         @click.native="tableCountChange(scope.row)">保存
+              </el-button>
               <el-button type="text" size="small" @click.stop="true"
                          @click.native="deleteCodeArray(scope.$index, scope.row)">删除
               </el-button>
@@ -133,6 +141,24 @@
       </el-card>
     </el-form>
 
+    <el-dialog
+      title="术士套包录入"
+      :visible.sync="selectWarlockBagVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectWarlockBagVisible"
+      :append-to-body='true'
+    >
+      <selectWarlockBag
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :codeArray="codeArray"
+        :pId="pId"
+        :type="4"
+      ></selectWarlockBag>
+    </el-dialog>
+
     <el-dialog
       title="产品录入"
       :visible.sync="selectProductVisible"
@@ -182,6 +208,7 @@ import {
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import SelectApplyListDialog from "@/views/purchase/purApply/selectApplyListDialog";
 import {parseTime} from "@/utils/coTools";
+import selectWarlockBag from "@/views/basic/destiny/warlockBagModel";
 
 
 export default {
@@ -247,6 +274,7 @@ export default {
       currentRow: {},
       selectedIndex: "",
       selectProductVisible: false,
+      selectWarlockBagVisible: false,
       thisData: {},
       storageList: [],
       invCodeList: [],
@@ -262,7 +290,8 @@ export default {
   components: {
     draggable,
     purPlanProducts,
-    SelectApplyListDialog
+    SelectApplyListDialog,
+    selectWarlockBag
   },
   methods: {
     saveOrder(status) {
@@ -300,6 +329,24 @@ export default {
             }
           }
           if (status == "1") {
+            if (this.formData.createTime == "" || this.formData.createTime == null) {
+              return this.$message.error("单据日期不能为空！");
+            }
+            // if (this.formData.billType == "" || this.formData.billType == null) {
+            //     return this.$message.error("采购类型不能为空！");
+            // }
+            if (this.formData.invCode == "" || this.formData.invCode == null) {
+              return this.$message.error("采购仓库不能为空！");
+            }
+            if (this.formData.emergency == "" || this.formData.emergency == null) {
+              return this.$message.error("紧急程度不能为空！");
+            }
+            if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
+              return this.$message.error("到货时间不能为空！");
+            }
+            if (this.formData.arrivalTime<this.formData.createTime) {
+              return this.$message.error("到货时间不能比单据日期早！！！");
+            }
             this.submitFunction(status);
           } else {
             let tip = "是否确定提交订单?";
@@ -357,11 +404,26 @@ export default {
       }
       this.thisData.stockOrderLists = this.codeArray;
     },
+    selectWarlockBagFunction() {
+      this.selectWarlockBagVisible = true;
+      //当父id为空的时候生成id
+      if (this.pId == null) {
+        addPlanId().then(response => {
+          if (response.code === 20000) {
+            this.pId = response.data
+          }
+        }).catch(() => {
+          this.loading = false;
+        })
+      }
+      this.thisData.stockOrderLists = this.codeArray;
+    },
     setDeptCode(obj) {
       this.formData.deptCode = this.invCodeList.find(item => item.code == obj).parentId;
     },
     closeDialogC2() {
       this.selectProductVisible = false;
+      this.selectWarlockBagVisible = false;
       this.selectApplyVisible = false;
       this.query = {
         orderIdFk: this.pId
@@ -380,12 +442,16 @@ export default {
         });
     },
     rowChange(val) {
+      if (this.currentRow != null){
+        updateDetail(this.currentRow);
+      }
       this.currentRow = val;
       this.selectedIndex = val.index;
     },
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
         updateDetail(this.currentRow);
+        this.selectedIndex = ""
       }
     },
     tableRowClassName({row, rowIndex}) {