采购计划功能代码提交

src/api/purchase/purApply.js

@@ -89,7 +89,7 @@ export function delApplyDetail(id) {
 // 添加pur
 export function addApplyDetail(data) {
   return request({
-    url: "/purchase/apply/addDetail/",
+    url: "/purchase/apply/addDetail",
     method: 'post',
     data: data
   })

src/api/purchase/purPlan.js

@@ -93,6 +93,15 @@ export function addPlanId() {
   })
 }
 // 根据申购单添加详情表
+export function addPlanDetailAndApply(data) {
+  return request({
+    url: "/purchase/plan/addPlanDetailAndApply",
+    method: 'post',
+    data: data
+  })
+}
+
+// 添加详情表
 export function addPlanDetail(data) {
   return request({
     url: "/purchase/plan/addPlanDetail",
@@ -101,4 +110,30 @@ export function addPlanDetail(data) {
   })
 }
 
+// 查询详情表
+export function selectPlanDetail(query) {
+  return request({
+    url: "/purchase/plan/list/detail",
+    method: 'get',
+    params: query
+  })
+}
+//删除计划表和详情表
+export function delPlanDetailAll(data) {
+  return request({
+    url: "/purchase/plan/delPlanDetailAll",
+    method: 'post',
+    data: data
+  })
+}
+//更新pur
+export function updateDetail(data) {
+  return request({
+    url: "/purchase/plan/updateDetail",
+    method: 'post',
+    data: data
+  })
+}
+
+
 

src/views/purchase/purApply/purApply.vue

@@ -117,6 +117,7 @@ export default {
     data() {
         return {
             showSearch: true,
+            pId:null,
             filterQuery: {
                 billAction: null,
                 billNo: "",
@@ -211,6 +212,7 @@ export default {
           var data={
             id:id
           }
+          this.pId=id
           //当在新增时取消添加操作删除掉这次的数据
           delApplyDetailAll(data).then((response)=>{
             if(response.code==20000){
@@ -268,8 +270,8 @@ export default {
                 });
         },
         handleClose(){
-          if( this.formName=='add'){
+          if( this.formName=='add' && this.pId!=null){
-            this.isChang=true
+            this.isChang=!this.isChang
           }else{
             this.newSpDistributionVisible=false
           }

src/views/purchase/purApply/selectApplyListDialog.vue

@@ -80,7 +80,7 @@
 <script>
 import pureApplyDetail from "./pureApplyDetailDialog";
 import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
-import {addPlanDetail} from "@/api/purchase/purPlan"
+import {addPlanDetail, addPlanDetailAndApply} from "@/api/purchase/purPlan"
 
 export default {
   name: "selectApplyListDialog",
@@ -130,6 +130,7 @@ export default {
       loading: false,
       currentRow: null,
       actDateRange: [],
+      selectApplyVisible:false,
       newSpDistributionVisible: false,
       pickerOptions: {
         shortcuts: [
@@ -265,7 +266,6 @@ export default {
     },
 
     combine() {
-      debugger
       if (this.$isBlank(this.currentRow.id)) {
         this.$message.error("未选择申购单！");
       }
@@ -279,15 +279,14 @@ export default {
           }
         }
       }
+      debugger
+
       var data = {
         id: this.pId,
-        rId: this.currentRow.id
+        applyId: this.currentRow.id
       }
-      addPlanDetail(data).then((res) => {
+      addPlanDetailAndApply(data).then((res) => {
-        if(res.code=20000){
+          this.closeDialog(res.data);
-          this.newSpDistributionVisible=false
-        }
-
       }).catch(() => {
 
       })

src/views/purchase/purPlan/purOrderSelectProduct.vue

@@ -114,8 +114,8 @@
 
 <script>
 import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
-import {addApplyDetail,addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
+import {addPlanDetail} from "@/api/purchase/purPlan"
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
 
 export default {
@@ -328,7 +328,7 @@ export default {
               supId:this.multipleSelection.customerId,
               zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
             };
-              addApplyDetail(tQuery).then((response) => {
+            addPlanDetail(tQuery).then((response) => {
                 this.loading = false;
                 if (response.code === 20000) {
                     this.closeDialog(response.data);

src/views/purchase/purPlan/purPlan.vue

@@ -46,8 +46,8 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="采购员" prop="createByName"></el-table-column>
+                <el-table-column label="采购部门" prop="deptName"></el-table-column>
                 <el-table-column label="采购仓库" prop="invName"></el-table-column>
-                <el-table-column label="采购分库" prop="subInvName"></el-table-column>
                 <el-table-column label="采购说明" prop="remark"></el-table-column>
                 <el-table-column label="状态" prop="status">
                     <template slot-scope="scope">
@@ -98,9 +98,12 @@
             @close='closeDialog'
             :close-on-click-modal="false"
             :close-on-press-escape="false"
+            :before-close ="handleClose"
         >
             <purPlanEdit
+                :isChang="isChang"
                 :closeDialog="closeDialog"
+                 v-on:cancelDialog="getId"
                 :idQuery="idQuery"
             ></purPlanEdit>
         </el-dialog>
@@ -108,12 +111,15 @@
 </template>
 <script>
 import purPlanEdit from "./purPlanEditDialog";
-import {delApply, inserThrOrderWeb, listPlan, listApplyDetail} from "@/api/purchase/purPlan";
+import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
+import {delApplyDetailAll} from "@/api/purchase/purApply";
 
 export default {
     data() {
         return {
             showSearch: true,
+            pId:null,
+            isChang:false,
             filterQuery: {
                 billAction: null,
                 billNo: "",
@@ -202,7 +208,28 @@ export default {
             this.actDateRange = [];
             this.getList();
         },
+      handleClose(){
+        if( this.formName=='add' && this.pId!=null){
+          this.isChang=!this.isChang
+        }else{
+          this.newSpDistributionVisible=false
+        }
+      },
+      getId(id){
+        if( this.formName=='add' && id!=null){
+          var data={
+            id:id
+          }
+          this.pId=id;
+          //当在新增时取消添加操作删除掉这次的数据
+          delPlanDetailAll(data).then((response)=>{
+            if(response.code==20000){
+              this.newSpDistributionVisible=false
+            }
+          });
+        }
 
+      },
         onSubmitFind() {
             this.filterQuery.page = 1;
             this.getList();
@@ -285,7 +312,7 @@ export default {
                 type: "warning",
             })
                 .then(() => {
-                    delApply(row.id)
+                  delPlanDetailAll({id:row.id})
                         .then((response) => {
                             this.loading = false;
                             if (response.code == 20000) {
@@ -316,6 +343,7 @@ export default {
 
 
         newDistributionForm(index, row) {
+          debugger
             this.idQuery.id = '';
             if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;

src/views/purchase/purPlan/purPlanAudit.vue

@@ -58,9 +58,9 @@
                 </el-table-column>
 
 
-                <el-table-column label="操作" width="120px">
+              <el-table-column label="操作" width="60px">
                 <template slot-scope="scope">
-                        <el-button type="text" size="small" :disabled="scope.row.status !=2" @click.native="newDistributionForm(scope.$index, scope.row)"></el-button>
+                  <el-button type="text" :disabled="scope.row.status!=2"  @click.native="newDistributionForm(scope.$index, scope.row)">审核</el-button>
                 </template>
               </el-table-column>
             </el-table>

src/views/purchase/purPlan/purPlanDetailDialog.vue

@@ -34,7 +34,7 @@
                 <el-row>
                     <el-col :span="11">
                         <el-form-item label="采购仓库:"  prop="locStorageCode">
-                            <el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息"  style="width: 90%"
+                            <el-select v-model="formData.invWarehouseCode" placeholder="采购仓库信息"  style="width: 90%"
                                        :disabled="true" clearable>
                                 <el-option
                                     v-for="item in subInvList"
@@ -85,10 +85,10 @@
                             <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型"  style="width: 90%">
                                 <el-option
                                     v-for="item in busTypes"
-                                    :key="item.localName"
+                                    :key="item.name"
-                                    :label="item.localName"
+                                    :label="item.action"
-                                    :value="item.localAction">
+                                    :value="item.action">
-                                    <span style="float: left">{{ item.localName }}</span>
+                                    <span style="float: left">{{ item.name }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -211,7 +211,6 @@ export default {
             selectedIndex: "",
             selectProductVisible: false,
             thisData: {},
-            storageList: [],
             subInvList: [],
             tarSubList: [],
             invQueryData: {},
@@ -245,6 +244,10 @@ export default {
             let tMessage = status === '1' ? '保存' : '提交';
             this.loading = true;
             let tQuery = {
+                autoPurchase:this.formData.autoPurchase,
+                targetSubInv:this.formData.targetSubInv,
+                targetDeptCode:this.formData.targetDeptCode,
+                targetBillAction:this.formData.targetBillAction,
                 editStatus: status,
                 purPlanEntity: this.formData,
                 subErpOrders: this.codeArray,
@@ -355,22 +358,6 @@ export default {
                     this.total = 0;
                 });
         },
-
-
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList != null && this.storageList.length == 1) {
-                        this.formData.locStorageCode = this.storageList[0].code;
-                    }
-                    this.findSubInvs();
-
-                })
-                .catch(() => {
-                });
-        },
         findSubInvs() {
             this.subInvList = [];
             let query = {
@@ -388,6 +375,9 @@ export default {
         },
 
         findTargetSubInvs() {
+          if(this.formData.targetSubInv!=null && this.tarSubList.length>0){
+            this.formData.targetDeptCode= this.subInvList.find(item => item.code == this.formData.targetSubInv).parentId
+          }
             this.tarSubList = [];
             let query = {
                 pcode: 1000
@@ -397,6 +387,8 @@ export default {
                     this.tarSubList = response.data || [];
                     if (this.tarSubList != null && this.tarSubList.length == 1) {
                         this.formData.targetSubInv = this.tarSubList[0].code;
+                        this.formData.targetDeptCode=this.tarSubList[0].parentId;
+
                         this.targetInvChange();
                     }
                 })
@@ -418,13 +410,6 @@ export default {
                 });
         },
 
-        locInChange(item) {
-            if (this.formData.invWarehouseCode != null) {
-                this.formData.invWarehouseCode = "";
-            }
-            this.formData.locStorageCode = item;
-            this.findSubInvs();
-        },
     },
     filters: {},
     mounted() {
@@ -460,7 +445,6 @@ export default {
             };
             this.orderEditor = false;
         }
-        this.getStorage();
         this.findTargetSubInvs();
         this.codeArray = [];
     },

src/views/purchase/purPlan/purPlanEditDialog.vue

@@ -114,6 +114,7 @@
             <purPlanProducts
                 :closeDialog="closeDialogC2"
                 :purType="1"
+                :pId="pId"
                 :data="thisData"
             ></purPlanProducts>
         </el-dialog>
@@ -139,10 +140,18 @@
 <script>
 import draggable from "vuedraggable";
 import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
-import {inserThrOrderWeb, delApplyDetail, listApplyDetail, addPlanId} from "@/api/purchase/purPlan";
+import {
+  inserThrOrderWeb,
+  delApplyDetail,
+  listApplyDetail,
+  addPlanId,
+  selectPlanDetail,
+  updateDetail
+} from "@/api/purchase/purPlan";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import SelectApplyListDialog from "@/views/purchase/purApply/selectApplyListDialog";
 
+
 export default {
     name: "idQuery",
     props: {
@@ -154,6 +163,10 @@ export default {
             type: Object,
             required: true,
         },
+      isChang: {
+        type: Boolean,
+        required: true,
+      },
     },
     data() {
         return {
@@ -207,6 +220,11 @@ export default {
             selectApplyVisible: false
         };
     },
+    watch: {
+      isChang: function () {
+        this.$emit("cancelDialog", this.pId);
+      },
+    },
     components: {
         draggable,
       purPlanProducts,
@@ -259,10 +277,14 @@ export default {
         submitFunction(status) {
             let tMessage = status === '1' ? '保存' : '提交';
             this.loading = true;
+          this.formData.id=this.pId;
+          this.formData.invCode=this.$store.getters.locInvCode
+          this.formData.deptCode=this.$store.getters.locDeptCode
             let tQuery = {
                 editStatus: status,
                 purPlanEntity: this.formData,
                 subErpOrders: this.codeArray,
+                type:1,
             }
             inserThrOrderWeb(tQuery)
                 .then(response => {
@@ -279,25 +301,40 @@ export default {
                 })
         },
         selectProductFunction() {
-            this.thisData.stockOrderLists = this.codeArray;
             this.selectProductVisible = 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.subInvList.find(item => item.code == obj).parentId;
         },
-        closeDialogC2(rData) {
+        closeDialogC2() {
             this.selectProductVisible = false;
             this.selectApplyVisible = false;
-            this.thisData = {};
+            this.query={
-            if (this.$isNotBlank(rData)) {
+              orderIdFk:this.pId
-                this.codeArray = [];
-                rData.forEach((obj, index) => {
-                    this.codeArray.unshift(obj);
-                });
-                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                this.currentRow = this.codeArray[0];
-                this.selectedIndex = 0;
             }
+          selectPlanDetail(this.query) //查找该单号下的所有条码
+              .then((response) => {
+                console.log(response)
+                this.codeArray = response.data.list || [];
+                this.total = response.data.total || 0;
+                this.loading = false;
+              })
+              .catch(() => {
+                this.loading = false;
+                this.list = [];
+                this.total = 0;
+            });
         },
         rowChange(val) {
             this.currentRow = val;
@@ -305,7 +342,7 @@ export default {
         },
         tableCountChange(row) {
           if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
+            updateDetail(this.currentRow);
           }
         },
         tableRowClassName({row, rowIndex}) {
@@ -416,7 +453,9 @@ export default {
     created() {
 
         if (this.$isNotBlank(this.idQuery.id)) {
+          debugger
             this.query.limit = 100;
+            this.pId=this.idQuery.id;
             this.query.orderIdFk = this.idQuery.id;
             this.formData = this.idQuery.formData;
             this.orderEditor = true;

src/views/purchase/purPlan/purPlanOrderSelectProduct.vue

@@ -159,6 +159,7 @@
 import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "../../../api/inout/stockOrder";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../";
+import {addApplyDetail} from "@/api/purchase/purApply";
 
 export default {
     name: "stockOrderNewSelectProduct",
@@ -358,20 +359,16 @@ export default {
         },
 
       combine() {
-            let ids = [];
-            let data = {
-                relId: this.multipleSelection.rlId,
-                supId: this.multipleSelection.customerId,
-                zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
-            }
-            ids.push(data);
         this.loading = true;
         let tQuery = {
-                datas: ids,
+          productId:this.multipleSelection.rlId,
-                stockOrderLists: this.data.stockOrderLists,
+          productName:this.multipleSelection.cpmctymc,
-                purType: this.purType
+          count:1,
+          orderIdFk:this.pId,
+          supId:this.multipleSelection.customerId,
+          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
         };
-            getStockOrderDetailInstrumentById(tQuery).then((response) => {
+        addPlanDetail(tQuery).then((response) => {
           this.loading = false;
           if (response.code === 20000) {
             this.closeDialog(response.data);

src/views/purchase/purPlan/purPlanSearch.vue

@@ -1,22 +1,20 @@
 <template>
     <div>
-        <el-card class="el-card">
+        <el-card>
-            <el-form :inline="true" :model="filterQuery"
+            <el-form  :model="filterQuery" class="query-form" label-width="100px"  size="mini">
-                     class="query-form" size="mini">
                 <el-row>
-                    <el-form-item class="query-form-item">
+                  <el-col :span="6">
-                        <el-input
+                    <el-form-item label="单据号">
-                            v-model="filterQuery.billNo"
+                        <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-                            placeholder="单据号"
-                            clearable
-                        ></el-input>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
+                  </el-col>
-                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                  <el-col :span="6">
+                    <el-form-item label="单据日期">
                         <el-date-picker
                             :picker-options="pickerOptions"
                             v-model="actDateRange"
                             type="daterange"
+                            style="width: 90%"
                             format="yyyy 年 MM 月 dd 日"
                             value-format="yyyy-MM-dd"
                             range-separator="至"
@@ -25,16 +23,16 @@
                         >
                         </el-date-picker>
                     </el-form-item>
+                  </el-col>
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
                         </el-button-group>
-
                     </el-form-item>
                 </el-row>
             </el-form>
-            <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
+            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
                       @current-change="handleDetail">
                 <el-table-column label="序号" type="index" width="60"></el-table-column>
                 <el-table-column label="单据号" prop="billNo"></el-table-column>
@@ -57,31 +55,28 @@
                 </el-table-column>
 
 
-                <el-table-column label="操作" fixed="right">
+                <el-table-column label="操作" >
                     <template slot-scope="scope">
-<!--                        <el-button-->
-<!--                            type="text"-->
-<!--                            size="small"-->
-<!--                            @click.native="newDistributionForm(scope.$index, scope.row)"-->
-<!--                        >审核-->
-<!--                        </el-button-->
-<!--                        >-->
                         <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
                         >删除
                         </el-button>
                     </template>
                 </el-table-column>
             </el-table>
-            <el-pagination
+
-                :page-size="filterQuery.limit"
+
-                @current-change="handleCurrentChange"
+          <pagination
-                layout="prev, pager, next"
+            v-show="total>0"
             :total="total"
-                :current-page="filterQuery.page"
+            :page.sync="filterQuery.page"
-            ></el-pagination>
+            :limit.sync="filterQuery.limit"
+            @pagination="handleCurrentChange"
+
+          ></pagination>
+
         </el-card>
         <el-card class="el-card">
-            <el-table v-loading="loading" :data="detailList" style="width: 100%">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
@@ -108,12 +103,14 @@
                 :idQuery="idQuery"
                 :editType="editType"
             ></purPlanEdit>
+
+
         </el-dialog>
     </div>
 </template>
 <script>
 import purPlanEdit from "./purPlanDetailDialog";
-import {delApply, listPlan, listApplyDetail} from "@/api/purchase/purPlan";
+import {delApply, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
 
 export default {
     data() {
@@ -260,7 +257,7 @@ export default {
                 type: "warning",
             })
                 .then(() => {
-                    delApply(row.id)
+                  delPlanDetailAll(row.id)
                         .then((response) => {
                             this.loading = false;
                             if (response.code == 20000) {
@@ -279,7 +276,7 @@ export default {
                 });
         },
         handleCurrentChange(val) {
-            this.filterQuery.page = val;
+            this.filterQuery.page = val.page;
             this.getList();
         },
 
@@ -334,32 +331,6 @@ export default {
 ;
 </script>
 <style scoped>
-.itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
-}
-
-.text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-}
-
-.query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
-}
-
-.el-row {
-    display: flex;
-    flex-wrap: wrap;
-}
 
-.el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
-}
 </style>