Merge remote-tracking branch 'origin/master'

src/api/inventory/invPlace.js

@@ -0,0 +1,25 @@
+import axios from "../../utils/request";
+
+export function getPlaceDetailList(params) {
+  return axios({
+    url: "/spms/inv/product/getPlaceDetailList",
+    method: "get",
+    params: params
+  });
+}
+
+export function bindInvSpace(data) {
+  return axios({
+    url: "/spms/inv/product/bindInvSpace",
+    method: "post",
+    data: data
+  });
+}
+
+export function checkCodeSpace(data) {
+  return axios({
+    url: "/spms/inv/product/checkCodeSpace",
+    method: "post",
+    data: data
+  });
+}

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
   })
@@ -109,5 +109,14 @@ export function addApplyId() {
       method: 'post',
       data: data
     })
+  }
+
+    //删除申购表和详情表
+    export function delApplyDetailAll(data) {
+      return request({
+        url: "/purchase/apply/delApplyDetailAll",
+        method: 'post',
+        data: data
+      })
 }
 

src/api/purchase/purPlan.js

@@ -1,86 +1,139 @@
 import axios from "@/utils/request";
+import request from "@/utils/request";
 
 export function listPlan(query) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/list',
+    url: '/purchase/plan/list',
-        method: 'get',
+    method: 'get',
-        params: query
+    params: query
-    })
+  })
 }
 
 export function auditListPlan(query) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/auditList',
+    url: '/purchase/plan/auditList',
-        method: 'get',
+    method: 'get',
-        params: query
+    params: query
-    })
+  })
 }
 
 
 export function listApplyDetail(query) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/list/detail',
+    url: '/purchase/plan/list/detail',
-        method: 'get',
+    method: 'get',
-        params: query
+    params: query
-    })
+  })
 }
 
 export function getApply(id) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/' + id,
+    url: '/purchase/plan/' + id,
-        method: 'get'
+    method: 'get'
-    })
+  })
 }
 
 export function addApply(data) {
-    return axios({
+  return axios({
-        url: '/purchase/plan',
+    url: '/purchase/plan',
-        method: 'post',
+    method: 'post',
-        data: data
+    data: data
-    })
+  })
 }
 
 
 export function auditOrder(data) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/auditOrder',
+    url: '/purchase/plan/auditOrder',
-        method: 'post',
+    method: 'post',
-        data: data
+    data: data
-    })
+  })
 }
 
 
 // 修改pur
 export function updateApply(data) {
-    return axios({
+  return axios({
-        url: '/purchase/plan',
+    url: '/purchase/plan',
-        method: 'put',
+    method: 'put',
-        data: data
+    data: data
-    })
+  })
 }
 
 // 删除pur
 export function delApply(id) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/' + id,
+    url: '/purchase/plan/' + id,
-        method: 'delete'
+    method: 'delete'
-    })
+  })
 }
 
 export function inserThrOrderWeb(query) {
-    return axios({
+  return axios({
-        url: "/purchase/plan/postOrder",
+    url: "/purchase/plan/postOrder",
-        method: "post",
+    method: "post",
-        data: query
+    data: query
-    });
+  });
 }
 
 
 // 删除pur
 export function delApplyDetail(id) {
-    return axios({
+  return axios({
-        url: '/purchase/plan/detail/' + id,
+    url: '/purchase/plan/detail/' + id,
-        method: 'delete'
+    method: 'delete'
-    })
+  })
 }
 
+  // 添加puan
+export function addPlanId() {
+   return request({
+    url: "/purchase/plan/add",
+    method: 'post'
+  })
+}
+// 根据申购单添加详情表
+export function addPlanDetailAndApply(data) {
+  return request({
+    url: "/purchase/plan/addPlanDetailAndApply",
+    method: 'post',
+    data: data
+  })
+}
+
+// 添加详情表
+export function addPlanDetail(data) {
+  return request({
+    url: "/purchase/plan/addPlanDetail",
+    method: 'post',
+    data: 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/inventory/InvPlace.vue

@@ -31,7 +31,7 @@
           <el-button-group style="margin-left: 10px;display:flex;">
             <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
             <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-box" @click="onSubmit">摆放</el-button>
+            <el-button type="primary" icon="el-icon-box" @click="invPlace">摆放</el-button>
           </el-button-group>
         </el-form-item>
       </el-form>
@@ -61,8 +61,112 @@
       ></pagination>
     </el-card>
 
+    <el-dialog
+      title="库存摆放"
+      :visible.sync="placeDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="60%"
+      v-if="placeDialogVisible"
+    >
+      <el-card style="margin: 5px;margin-top: -20px">
+        <el-form :model="formData" label-width="100px" style="margin-bottom: -15px">
+          <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+            <el-button
+              size="mini"
+              type="primary"
+              @click.native="saveData()"
+            >提交
+            </el-button
+            >
+          </el-button-group>
+          <el-row>
+            <el-col :span="10">
+              <el-form-item prop="invWarehouseCode" label="当前仓库:">
+                <el-select v-model="formData.invCode"
+                           placeholder="当前仓库信息"
+                           :disabled="codeArray.length>0"
+                           @change="formInvChange"
+                           style="width: 90%"
+                           clearable>
+                  <el-option
+                    v-for="item in invList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                    <span style="float: left">{{ item.name }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="10">
+              <el-form-item class="query-form-item" label="当前货位:">
+                <el-select v-model="formData.invSpaceCode"
+                           placeholder="当前货位信息"
+                           :disabled="codeArray.length>0"
+                           style="width: 90%"
+                           clearable>
+                  <el-option
+                    v-for="item in formSpaceList"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item.code">
+                    <span style="float: left">{{ item.name }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
+          <el-row>
+            <el-col :span="18">
+              <el-form-item class="query-form-item" label="扫码录入:">
+                <el-input
+                  id="inputer"
+                  @focus="getInputFocus($event)"
+                  @keypress.enter.native="enterKey($event)"
+                  ref='inputRef'
+                  style="ime-mode:disabled"
+                  type="tel"
+                  v-model="formData.code"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-button
+                type="primary"
+                size="mini"
+                @click.native.stop="addCode()"
+                style="margin-left: 15px"
+              >添加
+              </el-button
+              >
+            </el-col>
+          </el-row>
 
+          <el-table v-loading="codeTableLoading" :data="codeArray" style="width: 100%;margin-top: 20px;"
+                    highlight-current-row
+                    border max-height="300" height="300">
+            <el-table-column label="序号" type="index" width="50"></el-table-column>
+            <el-table-column label="条码" prop="code" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" width="150">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="deleteCodeArray(scope.$index, scope.row)"
+                >删除
+                </el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </el-card>
+    </el-dialog>
 
   </div>
 </template>
@@ -70,8 +174,7 @@
 <script>
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
-import {getInvProduct, deleteInvProduct} from "@/api/inventory/invPorduct";
+import {getPlaceDetailList, bindInvSpace, checkCodeSpace} from "@/api/inventory/invPlace";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
 
 export default {
@@ -82,33 +185,25 @@ export default {
         invCode: this.$store.getters.locInvCode,
         invSpaceCode: null,
         page: 1,
-        limit: 10,
+        limit: 20,
       },
       list: [],
       total: 0,
       invList: [],
       spaceList: [],
       loading: false,
-      deleteData: {
-        id: "",
-        status: 10,
-      },
-      corpLoading: false,
-      dialogVisible: false,
       fromOptions: [],
-      showSup: false,
+      formData: {
-      detailDialogVisible: false,
+        invCode: null,
-      inputQuery: {
+        invSpaceCode: null,
-        cpmctymc: null,
+        code: null,
-        nameCode: null,
+        codeArray: []
-        batchNo: null,
+      },
-        ggxh: null,
+      placeDialogVisible: false,
-        productionDate: null,
+      codeTableLoading: false,
-        expireDate: null,
+      codeArray: [],
-        supId: null,
+      formInvList: [],
-        deptCode: null,
+      formSpaceList: []
-        invCode: null
-      }
     };
   },
   methods: {
@@ -117,16 +212,10 @@ export default {
         path: "",
       });
       this.filterQuery = {
-        nameCode: null,
-        cpmctymc: null,
-        ggxh: null,
-        batchNo: null,
-        supId: null,
-        zczbhhzbapzbh: null,
-        ylqxzcrbarmc: null,
         invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
         page: 1,
-        limit: 10,
+        limit: 20,
       };
       this.getList();
     },
@@ -134,17 +223,9 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
     getList() {
       this.loading = true;
-      getInvProduct(this.filterQuery).then((res) => {
+      getPlaceDetailList(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {
           this.list = res.data.list || [];
@@ -163,88 +244,136 @@ export default {
     },
     invChange() {
       this.spaceList = [];
+      this.getSpaceList();
       this.getList();
     },
     getInvList() {
       getInvListByUser()
         .then((response) => {
           this.invList = response.data || [];
+          this.getSpaceList();
           this.getList();
         })
         .catch(() => {
         });
     },
     getSpaceList() {
-      let params = {};
+      let params = {invWarehouseCode: this.filterQuery.invCode};
       getInvSpaceList(params).then((res) => {
-        this.spaceList = res.data || [];
+        this.spaceList = res.data.list || [];
       })
     },
-    findMethod(key) {
+    formInvChange() {
-      this.corpLoading = true;
+      this.formData.invSpaceCode = null;
-      this.fromOptions = [];
+      let params = {invWarehouseCode: this.formData.invCode}
-      let params = {
+      getInvSpaceList(params).then((res) => {
-        key: key,
+        this.formSpaceList = res.data.list || [];
-        corpType: 2,
-        page: 1,
-        limit: 20
-      };
-      getBasicUnitMaintains(params).then((res) => {
-        this.corpLoading = false;
-        this.fromOptions = res.data.list || [];
-      }).catch(() => {
-        this.corpLoading = false;
       })
     },
-    corpChange(value) {
+    invPlace() {
-      if (!isBlank(value)) {
+      this.placeDialogVisible = true;
-        this.findMethod(value);
+      this.formData = {
+        invCode: null,
+        invSpaceCode: null,
+        code: null,
+        codeArray: []
+      };
+      this.codeArray = [];
+    },
+    deleteCodeArray(index, row) {
+      for (let i = 0; i < this.codeArray.length; i++) {
+        if (this.codeArray[i] === row) {
+          this.codeArray.splice(i, 1);
+          return;
+        }
       }
     },
-    detailDialog(row) {
+    addCode(event) {
-      this.detailDialogVisible = true;
+      if (event != null) {
-      this.inputQuery = {
+        event.target.select();
-        relId: row.relIdFk,
+      }
-        cpmctymc: row.cpmctymc,
+      this.$refs.inputRef.select();
-        nameCode: row.nameCode,
+      if (isBlank(this.formData.invCode)) {
-        batchNo: row.batchNo,
+        this.$message.error('当前仓库不能为空');
-        ggxh: row.ggxh,
+        return;
-        productionDate: row.productionDate,
+      }
-        expireDate: row.expireDate,
+
-        supId: row.supId,
+      if (isBlank(this.formData.invSpaceCode)) {
-        deptCode: row.deptCode,
+        this.$message.error('当前货位不能为空');
-        invCode: row.invCode
+        return;
       }
+
+      this.formData.code = this.formData.code.trim();
+      if (this.$isBlank(this.formData.code)) return;
+      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
+      this.checkCode(tQuery);
+      this.$refs.inputRef.select();
+    },
+    getInputFocus(event) {
+      event.currentTarget.select();
     },
-    closeDetailDialog() {
+    enterKey(event) {
-      this.detailDialogVisible = false;
+      this.checkSuccess = true;
+      this.addCode(event);
+      this.$refs.inputRef.focus();
+      this.$refs.inputRef.select();
     },
-    deleteDialog(id) {
+    checkCode(tQuery) {
-      this.$confirm("此操作将永久删除此库存信息，是否继续？", "提示", {
+      //检验是否重复添加
-        confirmButtonText: "确定",
+      let flag = false;
-        cancelButtonText: "取消",
+      this.codeArray.forEach(item => {
-        type: "warning"
+        if (item.code === this.formData.code) {
-      }).then(() => {
+          this.$message.error("重复条码！");
-        this.deleteInvProduct(id);
+          flag = true;
-      }).catch(() => {
+          return;
+        }
+      });
+      if (flag) {
+        return;
+      }
+      //校验此条码是否已经被绑定到其他货位，如已被绑定，则提示，点击确定之后，重置此库存数据的仓库和分库数据
+      checkCodeSpace(tQuery).then((res) => {
+        if (res.code === 20000) {
+          this.codeArray.push({code: this.formData.code});
+        } else if (res.code === 8) {
+          this.loading = false;
+          this.$message.error(res.message);
+        } else if (res.code === 7) {
+          this.$confirm(res.message, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.codeArray.push({code: this.formData.code});
+          }).catch(() => {
+            this.loading = false;
+          });
+        }
       });
     },
-    deleteInvProduct(id) {
+    saveData() {
-      let params = {id: id};
+      if (isBlank(this.formData.invCode) || isBlank(this.formData.invSpaceCode)) {
-      deleteInvProduct(params).then((res) => {
+        this.$message.warning("请选择仓库和货位信息");
+        return;
+      }
+      if (this.codeArray.length === 0) {
+        this.$message.warning("请扫描需要摆放的货物");
+        return;
+      }
+      this.formData.codeArray = [];
+      this.codeArray.forEach(item => {
+        this.formData.codeArray.push(item.code);
+      });
+      bindInvSpace(this.formData).then((res) => {
         if (res.code === 20000) {
-          this.$message.success("删除成功！");
+          this.$message.success("绑定成功");
+          this.placeDialogVisible = false;
           this.getList();
         } else {
-          this.$message.error(res.message);
+          this.$message.error("绑定失败");
         }
-      }).catch((error) => {
+      })
-        this.$message.error(error.message);
+    },
-      });
-    }
-  },
-  components: {
-
   },
   mounted() {
     document.body.ondrop = function (event) {
@@ -253,9 +382,7 @@ export default {
     };
   },
   created() {
-    this.findMethod();
     this.getInvList();
-    this.getList();
   },
 };
 </script>

src/views/inventory/InvStatistics.vue

@@ -127,17 +127,6 @@
                          show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="仓库" prop="invName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="操作" width="150">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="detailDialog(scope.row)"
-            >详情
-            </el-button
-            >
-          </template>
-        </el-table-column>
       </el-table>
       <pagination
         v-show="total>0"
@@ -147,21 +136,6 @@
         @pagination="getList"
       ></pagination>
     </el-card>
-
-    <el-dialog
-      title="库存详情"
-      :visible.sync="detailDialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="85%"
-      v-if="detailDialogVisible"
-    >
-      <invProductsDetail
-        :inputQuery="inputQuery"
-        v-on:closeDetailDialog="closeDetailDialog"
-      ></invProductsDetail>
-    </el-dialog>
-
   </div>
 </template>
 
@@ -173,7 +147,7 @@ import {isBlank} from "@/utils/strUtil";
 import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
 
 export default {
-  name: "InvProducts",
+  name: "InvStatistics",
   data() {
     return {
       showSearch: true,
@@ -193,26 +167,9 @@ export default {
       total: 0,
       invList: [],
       loading: false,
-      deleteData: {
-        id: "",
-        status: 10,
-      },
       corpLoading: false,
-      dialogVisible: false,
       fromOptions: [],
       showSup: false,
-      detailDialogVisible: false,
-      inputQuery: {
-        cpmctymc: null,
-        nameCode: null,
-        batchNo: null,
-        ggxh: null,
-        productionDate: null,
-        expireDate: null,
-        supId: null,
-        deptCode: null,
-        invCode: null
-      }
     };
   },
   methods: {
@@ -308,27 +265,8 @@ export default {
         this.findMethod(value);
       }
     },
-    detailDialog(row) {
-      this.detailDialogVisible = true;
-      this.inputQuery = {
-        relId: row.relIdFk,
-        cpmctymc: row.cpmctymc,
-        nameCode: row.nameCode,
-        batchNo: row.batchNo,
-        ggxh: row.ggxh,
-        productionDate: row.productionDate,
-        expireDate: row.expireDate,
-        supId: row.supId,
-        deptCode: row.deptCode,
-        invCode: row.invCode
-      }
-    },
-    closeDetailDialog() {
-      this.detailDialogVisible = false;
-    },
   },
   components: {
-    invProductsDetail
   },
   mounted() {
     document.body.ondrop = function (event) {

src/views/purchase/purApply/purApply.vue

@@ -103,18 +103,21 @@
             <pureApplyEdit
                 :closeDialog="closeDialog"
                 :idQuery="idQuery"
+                 v-on:cancelDialog="getId"
+                :isChang="isChang"
             ></pureApplyEdit>
         </el-dialog>
     </div>
 </template>
 <script>
 import pureApplyEdit from "./purApplyEditDiaolog";
-import {delApply, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
+import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
 
 export default {
     data() {
         return {
             showSearch: true,
+            pId:null,
             filterQuery: {
                 billAction: null,
                 billNo: "",
@@ -126,6 +129,7 @@ export default {
                 type: 1,
                 editStatus: 1,
             },
+            isChang:false,
             formName: null,
             formMap: {
                 add: "新增申购单据",
@@ -203,7 +207,21 @@ export default {
             this.actDateRange = [];
             this.getList();
         },
+      getId(id){
+        if( this.formName=='add' && id!=null){
+          var data={
+            id:id
+          }
+          this.pId=id
+          //当在新增时取消添加操作删除掉这次的数据
+          delApplyDetailAll(data).then((response)=>{
+            if(response.code==20000){
+              this.newSpDistributionVisible=false
+            }
+          });
+        }
 
+      },
         onSubmitFind() {
             this.filterQuery.page = 1;
             this.getList();
@@ -252,9 +270,11 @@ export default {
                 });
         },
         handleClose(){
-           console.log("1111");
+          if( this.formName=='add' && this.pId!=null){
-          this.newSpDistributionVisible = false;
+            this.isChang=!this.isChang
-
+          }else{
+            this.newSpDistributionVisible=false
+          }
         },
         submitOrder(row) {
             this.loading = true;

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -148,6 +148,14 @@ export default {
             type: Object,
             required: true,
         },
+      changId: {
+        type: Boolean,
+        required: true,
+      },
+      isChang: {
+        type: Function,
+        required: true,
+      },
     },
     data() {
         return {
@@ -202,6 +210,11 @@ export default {
 
         };
     },
+   watch: {
+     isChang: function () {
+       this.$emit("cancelDialog", this.pId);
+     },
+   },
     components: {
         draggable,
       purApplyProducts,

src/views/purchase/purApply/selectApplyListDialog.vue

@@ -0,0 +1,344 @@
+<template>
+  <div>
+    <el-card style="margin-top: -15px">
+      <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="单据号:" class="query-form-item">
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单据日期:" class="query-form-item">
+              <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="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="combine">确定</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="单据号" prop="billNo"></el-table-column>
+        <el-table-column label="申购日期" prop="billDate">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" prop="createByName"></el-table-column>
+        <el-table-column label="审核人" prop="auditByName"></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>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+
+      ></pagination>
+
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="120"></el-table-column>
+        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import pureApplyDetail from "./pureApplyDetailDialog";
+import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
+import {addPlanDetail, addPlanDetailAndApply} from "@/api/purchase/purPlan"
+
+export default {
+  name: "selectApplyListDialog",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    pId: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+
+        billAction: null,
+        billNo: "",
+        originType: null,
+        page: 1,
+        limit: 10,
+      },
+      formName: null,
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      ids: [],
+      idQuery: {},
+      editType: 2,
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      loading: false,
+      currentRow: null,
+      actDateRange: [],
+      selectApplyVisible:false,
+      newSpDistributionVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getList() {
+      if (this.actDateRange != null) {
+        this.filterQuery.startDate = this.actDateRange[0];
+        this.filterQuery.endDate = this.actDateRange[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      this.loading = true;
+      this.filterQuery.status = 3;
+      auditListApply(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      this.currentRow = row;
+      let query = {orderIdFk: row.id};
+      this.loading = true;
+      listApplyDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delApply(row.id)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+
+    combine() {
+      if (this.$isBlank(this.currentRow.id)) {
+        this.$message.error("未选择申购单！");
+      }
+      if (this.ids.length > 0) {
+        for (var i = 0; i < this.ids.length; i++) {
+          for (let j = 0; j < this.detailList.length; j++) {
+            if (this.ids[i] == this.detailList[j].productId) {
+              this.$message.error("该申购单已有产品被选入！");
+              return;
+            }
+          }
+        }
+      }
+
+      var data = {
+        id: this.pId,
+        applyId: this.currentRow.id
+      }
+      addPlanDetailAndApply(data).then((res) => {
+          this.closeDialog(res.data);
+      }).catch(() => {
+
+      })
+
+
+    },
+
+
+  },
+  created() {
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+
+    this.ids = [];
+    if (this.data.stockOrderLists.length > 0) {
+      for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+        this.ids.push(this.data.stockOrderLists[i].productId);
+      }
+    }
+
+  },
+  components: {
+    pureApplyDetail
+  },
+
+
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        3: "success",
+        4: "danger",
+      };
+      return statusMap[status];
+    }
+    ,
+  }
+  ,
+
+
+};
+</script>
+
+<style scoped>
+
+div /deep/ .el-table .warning-row {
+  background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+  background: #ffffff;
+}
+</style>

src/views/purchase/purPlan/purOrderSelectProduct.vue

@@ -0,0 +1,386 @@
+<template>
+    <div>
+        <el-card class="el-card">
+                <el-form  :model="listQuery" label-width="120px" v-show="showSearch">
+                    <el-row>
+                      <el-col :span="12">
+                        <el-form-item label="UDI码:" class="query-form-item">
+                            <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
+                        </el-form-item>
+                      </el-col>
+                     <el-col :span="6">
+                       <el-form-item label="第三方产品编码:" class="query-form-item">
+                         <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
+                     </el-form-item>
+                  </el-col>
+                    </el-row>
+
+                    <el-row>
+                      <el-col :span="6">
+                        <el-form-item label="物品编码:" class="query-form-item">
+                            <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="产品通用名:" class="query-form-item">
+                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item  label="规格型号:" class="query-form-item">
+                            <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="生产企业:" class="query-form-item">
+                          <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                                    clearable="true"></el-input>
+                        </el-form-item>
+                      </el-col>
+                    </el-row>
+                </el-form>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="confirmSelect">确定</el-button>
+            </el-button-group>
+          </div>
+          <el-divider style="margin: 15px"></el-divider>
+
+                <el-table :data="dataList" style="width: 100%"  v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
+                    <el-table-column label width="45">
+                        <template slot-scope="scope">
+                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
+                    <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="操作"  width="160">
+                        <template slot-scope="scope">
+                            <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+
+          <pagination
+            v-show="pageTotal>0"
+            :total="pageTotal"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="handleErpPageChange"
+
+          ></pagination>
+        </el-card>
+
+
+        <el-dialog
+            title="耗材字典详情"
+            :visible.sync="udiRlDetailVisible"
+            width="80%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="udiRlDetailVisible"
+        >
+            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+        </el-dialog>
+
+        <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
+            <el-form :model="form">
+                <el-form-item label="" prop="isGive">
+                    <el-radio-group v-model="currentCert">
+                        <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="selectCert">确 定</el-button>
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
+import store from "../../../store";
+import {addPlanDetail} from "@/api/purchase/purPlan"
+import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
+
+export default {
+    name: "stockOrderNewSelectProduct",
+    props: {
+        data: {
+            type: Object,
+            required: true,
+        },
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        purType: {
+            type: Object,
+            required: true,
+        },
+        pId: {
+          type: Object,
+          required: true,
+        },
+    },
+
+    data() {
+        return {
+            showSearch: true,
+            listQuery: {
+                purType: null,
+                udiCode: null,
+                unicode: null,
+                cpmctymc: null,
+                ggxh: null,
+                ylqxzcrbarmc: null,
+                thrPiId: null,
+                page: 1,
+                limit: 10,
+            },
+            combineQuery: {
+                thirdId: "",
+                relId: "",
+                erpName: "",
+                keys: [],
+            },
+            ids:[],
+            radioCheck: null,
+            dataList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            loading: false,
+            udiRlDetailVisible: false,
+            thirdSys: [],
+            thirdSysFk: null,
+            busTypes: [],
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+            orderEditor: false,
+            orderId: "",
+            currentCert: null,
+            certList: [],
+            dialogFormVisible: false,
+            multipleSelection: null,
+        };
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.listQuery = {
+                purType: null,
+                udiCode: null,
+                unicode: null,
+                cpmctymc: null,
+                ggxh: null,
+                ylqxzcrbarmc: null,
+                thrPiId: null,
+                page: 1,
+                limit: 10
+            }
+            this.multipleSelection = [];
+            this.radioCheck = null;
+            this.currentRow = null;
+            this.getList();
+        },
+        hideSearch() {
+          this.showSearch = !this.showSearch;
+        },
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        checkSelectable(row) {
+            return !row.check;
+        },
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        handleChange(val) {
+            this.radioCheck = val.id;
+            this.currentRow = val;
+            this.multipleSelection = val
+        },
+        handleDetailClick(row) {
+            this.currentRow = row;
+            this.udiRlDetailVisible = true;
+
+        },
+        handleErpPageChange(val) {
+            this.listQuery.page = val.page;
+            this.getList();
+        },
+        keyup_submit(event) {
+            this.listQuery.page = 1;
+            this.getList();
+            event.target.select();
+        },
+        search() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.listQuery.customerId = store.getters.customerId;
+            filterCompanyProductRelevance(this.listQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code === 20000) {
+                this.dataList = response.data.list || [];
+                this.pageTotal = response.data.total || 0;
+              } else {
+                this.$message.error(response.message);
+                this.dataList = [];
+                this.pageTotal = 0;
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              this.dataList = [];
+              this.pageTotal = 0;
+            });
+        },
+        intentBack() {
+            this.closeDialog();
+        },
+
+
+        confirmSelect() {
+            if (this.multipleSelection == null) {
+                this.$message.error('未选择产品');
+                return;
+            }
+
+            if(this.ids.length>0){
+                for(var i=0;i<this.ids.length;i++){
+                   if(this.ids[i]==this.multipleSelection.rlId){
+                    this.$message.error("该产品已录入！");
+                    return
+                   }
+                }
+            }
+            let str = this.multipleSelection.zczbhhzbapzbh;
+            if (str.search(",") != -1) {
+                this.currentCert = null;
+                this.certList = str.split(',');
+                this.dialogFormVisible = true;
+            } else {
+                this.combine();
+            }
+        },
+
+        combine() {
+            this.loading = true;
+            let tQuery = {
+              productId:this.multipleSelection.rlId,
+              productName:this.multipleSelection.cpmctymc,
+              count:1,
+              orderIdFk:this.pId,
+              supId:this.multipleSelection.customerId,
+              zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
+            };
+            addPlanDetail(tQuery).then((response) => {
+                this.loading = false;
+                if (response.code === 20000) {
+                    this.closeDialog(response.data);
+                } else {
+                    if (response.code == 601) {
+                        this.$alert(response.message, "提示", {
+                            confirmButtonText: "确定",
+                        });
+                    } else
+                        this.$message.error(response.message);
+                }
+            }).catch(() => {
+                this.loading = false;
+            });
+
+        },
+
+        selectCert() {
+            if (this.currentCert == null) {
+                this.$message.error("请先选择对应的注册证！");
+            }else{
+               this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+               this.combine();
+            }
+
+        },
+    },
+    components: {udiRlDetailDialog},
+
+    created() {
+        console.log(this.data)
+        if (this.$isNotBlank(this.data)) {
+            this.ids=[];
+            if(this.data.stockOrderLists.length>0){
+                for(var i=0;i<this.data.stockOrderLists.length;i++){
+                    this.ids.push(this.data.stockOrderLists[i].productId);
+                }
+            }
+        }
+
+    },
+};
+</script>
+
+<style scoped>
+
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+</style>

src/views/purchase/purPlan/purPlan.vue

@@ -0,0 +1,416 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <el-form  :model="filterQuery" class="query-form"  label-width="100px" v-show="showSearch">
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="单据号:">
+                        <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <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="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+            </el-form>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增采购计划</el-button>
+            </el-button-group>
+          </div>
+          <el-divider style="margin: 15px"></el-divider>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail">
+                <el-table-column label="序号" type="index" width="60"></el-table-column>
+                <el-table-column label="单据号" prop="billNo"></el-table-column>
+                <el-table-column label="采购日期" prop="billDate">
+                    <template slot-scope="scope">
+                        <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+                    </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="remark"></el-table-column>
+                <el-table-column label="状态" prop="status">
+                    <template slot-scope="scope">
+                        <el-tag :type="(scope.row.status) | statusFilterType">
+                            {{ statusMap[scope.row.status] }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+
+
+                <el-table-column label="操作"  width="120">
+                    <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>
+
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="filterQuery.page"
+            :limit.sync="filterQuery.limit"
+            @pagination="handleCurrentChange"
+
+          ></pagination>
+        </el-card>
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+                <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>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="newSpDistributionVisible"
+            width="80%"
+            v-if="newSpDistributionVisible"
+            @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>
+    </div>
+</template>
+<script>
+import purPlanEdit from "./purPlanEditDialog";
+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: "",
+                originType: null,
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            },
+            formName: null,
+            formMap: {
+                add: "新增采购计划",
+                update: "编辑采购计划",
+            },
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+                4: "已拒绝"
+            },
+            idQuery: {},
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes: [],
+            list: [],
+            detailList: [],
+            loading: false,
+            actDateRange: [],
+            newSpDistributionVisible: false,
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            };
+            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();
+        },
+        hideSearch() {
+          this.showSearch = !this.showSearch;
+        },
+        getList() {
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
+            this.loading = true;
+            listPlan(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleDetail(row) {
+            let query = {orderIdFk: row.id};
+            this.loading = true;
+            listApplyDetail(query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.detailList = response.data.list || [];
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                    this.total = 0;
+                });
+        },
+        submitOrder(row) {
+            this.$confirm("是否确定提交审核?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.loading = true;
+                    let tQuery = {
+                        editStatus: 2,
+                        purPlanEntity: row,
+                    }
+                    inserThrOrderWeb(tQuery)
+                        .then(response => {
+                            this.loading = false;
+                            if (response.code === 20000) {
+                                this.$message.success("提交成功！");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        })
+                })
+                .catch(() => {
+                });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                  delPlanDetailAll({id:row.id})
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+
+                })
+                .catch(() => {
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val.page;
+            this.getList();
+        },
+
+        closeDialog() {
+            this.newSpDistributionVisible = false;
+            this.getList();
+            this.detailList = [];
+        },
+
+
+        newDistributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.formName = "update";
+            } else
+                this.formName = "add";
+            this.newSpDistributionVisible = true;
+        },
+
+    }
+    ,
+    components: {
+        purPlanEdit,
+    }
+    ,
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                1: "warning",
+                2: "success",
+            };
+            return statusMap[status];
+        }
+        ,
+    }
+    ,
+    mounted() {
+    }
+    ,
+    created() {
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+        this.getList();
+    }
+    ,
+}
+;
+</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>
+

src/views/purchase/purPlan/purPlanAudit.vue

@@ -0,0 +1,363 @@
+<template>
+    <div>
+        <el-card class="el-card">
+          <el-form  :model="filterQuery" class="query-form"  label-width="100px" v-show="showSearch">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="单据号:">
+                  <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="单据号" clearable></el-input>
+                </el-form-item>
+              </el-col>
+              <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="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+            </el-button-group>
+          </div>
+          <el-divider style="margin: 15px"></el-divider>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail">
+                <el-table-column label="序号" type="index" width="60"></el-table-column>
+                <el-table-column label="单据号" prop="billNo"></el-table-column>
+                <el-table-column label="采购日期" prop="billDate">
+                    <template slot-scope="scope">
+                        <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></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">
+                        <el-tag :type="(scope.row.status) | statusFilterType">
+                            {{ statusMap[scope.row.status] }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+
+
+              <el-table-column label="操作" width="60px">
+                <template slot-scope="scope">
+                  <el-button type="text" :disabled="scope.row.status!=2"  @click.native="newDistributionForm(scope.$index, scope.row)">审核</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="filterQuery.page"
+            :limit.sync="filterQuery.limit"
+            @pagination="handleCurrentChange"
+
+          ></pagination>
+
+
+
+        </el-card>
+        <el-card class="el-card">
+            <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+                <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>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="newSpDistributionVisible"
+            width="80%"
+            v-if="newSpDistributionVisible"
+            @close='closeDialog'
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
+            <purPlanEdit
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :editType="editType"
+            ></purPlanEdit>
+        </el-dialog>
+    </div>
+</template>
+<script>
+import purPlanEdit from "./purPlanDetailDialog";
+import {delApply, auditListPlan, listApplyDetail} from "@/api/purchase/purPlan";
+
+export default {
+    data() {
+        return {
+            showSearch: true,
+            filterQuery: {
+                billAction: null,
+                billNo: "",
+                originType: null,
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            },
+            formName: null,
+            formMap: {
+                add: "新增采购计划",
+                update: "采购计划审核",
+            },
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+                4: "已拒绝"
+            },
+            idQuery: {},
+            editType: 1,
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes: [],
+            list: [],
+            detailList: [],
+            loading: false,
+            actDateRange: [],
+            newSpDistributionVisible: false,
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+        hideSearch() {
+          this.showSearch = !this.showSearch;
+        },
+        getList() {
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
+            this.loading = true;
+            auditListPlan(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleDetail(row) {
+            let query = {orderIdFk: row.id};
+            this.loading = true;
+            listApplyDetail(query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.detailList = response.data.list || [];
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    delApply(row.id)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+
+                })
+                .catch(() => {
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val.page;
+            this.getList();
+        },
+
+        closeDialog() {
+            this.newSpDistributionVisible = false;
+            this.getList();
+            this.detailList = [];
+        },
+
+
+        newDistributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.formName = "update";
+            } else
+                this.formName = "add";
+            this.newSpDistributionVisible = true;
+        },
+
+    }
+    ,
+    components: {
+        purPlanEdit,
+    }
+    ,
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                2: "warning",
+                3: "success",
+                4: "danger",
+            };
+            return statusMap[status];
+        }
+        ,
+    }
+    ,
+    mounted() {
+    }
+    ,
+    created() {
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+        this.getList();
+    }
+    ,
+}
+;
+</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>
+

src/views/purchase/purPlan/purPlanDetailDialog.vue

@@ -0,0 +1,467 @@
+<template>
+    <div>
+
+        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
+            <el-row type="flex" justify="end" v-if="editType == 1">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                    <el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
+                    <el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
+                </el-button-group>
+            </el-row>
+
+            <el-card style="margin-top: -5px;">
+                <el-row>
+                    <el-col  :span="11">
+                        <el-form-item label="单据号:"  prop="billNo">
+                            <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-form-item label="单据日期:"  prop="billdate">
+                            <el-date-picker
+                                v-model="formData.billDate"
+                                type="datetime"
+                                placeholder="选择日期" :disabled="true"
+                                style="width: 90%"
+                                :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="11">
+                        <el-form-item label="采购仓库:"  prop="locStorageCode">
+                            <el-select v-model="formData.invWarehouseCode" placeholder="采购仓库信息"  style="width: 90%"
+                                       :disabled="true" clearable>
+                                <el-option
+                                    v-for="item in subInvList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-form-item label="审核说明:"  prop="billNo">
+                            <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea" autosize></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="11">
+                        <el-form-item label="采购说明:"  prop="billNo">
+                            <el-input v-model="formData.remark"   style="width: 90%":disabled="true" auto-complete="off" type="textarea" autosize></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-form-item>
+                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+                <el-row  v-show="formData.autoPurchase">
+                    <el-col :span="11">
+                        <el-form-item label="入库仓库:"  prop="locStorageCode">
+                            <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息"  style="width: 90%" @change="targetInvChange" clearable>
+                                <el-option
+                                    v-for="item in tarSubList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-form-item label="入库单据类型:"  class="query-form-item" prop="targetBillAction">
+                            <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型"  style="width: 90%">
+                                <el-option
+                                    v-for="item in busTypes"
+                                    :key="item.name"
+                                    :label="item.action"
+                                    :value="item.action">
+                                    <span style="float: left">{{ item.name }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+            </el-card>
+
+            <el-card>
+                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
+                    <el-table-column label="序号" type="index" width="50"></el-table-column>
+                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column width="150" label="单据数量">
+                        <template slot-scope="scope">
+                            <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>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </el-form>
+
+        <el-dialog
+            title="产品录入"
+            :visible.sync="selectProductVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="80%"
+            v-if="selectProductVisible"
+            :append-to-body='true'
+        >
+            <purPlanProducts
+                :closeDialog="closeDialogC2"
+                :data="thisData"
+                :purType="1"
+            ></purPlanProducts>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
+import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
+import {filterAllByUser} from "@/api/system/invWarehouse";
+import {filterSubByInv} from "@/api/system/invSubWarehouse";
+import {getLocalJoinByUser} from "@/api/basic/busType";
+
+export default {
+    name: "idQuery",
+    props: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        idQuery: {
+            type: Object,
+            required: true,
+        },
+        editType: {
+            type: Object,
+            required: true,
+        },
+    },
+    data() {
+        return {
+            code: "",
+            query: {
+                orderIdFk: "",
+                page: 1,
+                limit: 10,
+            },
+            formData: {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                auditRemark: null,
+                autoPurchase: false,
+                targetInv: 1000,
+                targetSubInv: null,
+                targetBillAction: null,
+            },
+            formRules: {},
+            codeArray: [],
+            total: 0,
+            loading: false,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+            },
+            typeMap: {
+                1: "预入库",
+                2: "普通采购",
+            },
+            orderEditor: true,
+            sOptions: [],
+            sValue: [],
+            sList: [],
+            sLoading: false,
+            busTypes: [],
+            currentRow: {},
+            selectedIndex: "",
+            selectProductVisible: false,
+            thisData: {},
+            subInvList: [],
+            tarSubList: [],
+            invQueryData: {},
+
+
+        };
+    },
+    components: {
+        draggable,
+        purPlanProducts,
+    },
+    methods: {
+        saveOrder(status) {
+            let tip = "";
+            if (status == "3") {
+                tip = "是否确定通过该采购计划？";
+            } else {
+                tip = "是否确定拒绝该采购计划？";
+            }
+            this.$confirm(tip, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.submitFunction(status);
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        submitFunction(status) {
+            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,
+            }
+            auditOrder(tQuery)
+                .then(response => {
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.$message.success(tMessage + "成功");
+                        this.closeDialog(true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                })
+        },
+        selectProductFunction() {
+            this.selectProductVisible = true;
+        },
+        closeDialogC2(rData) {
+            this.selectProductVisible = false;
+            this.thisData = {};
+            if (this.$isNotBlank(rData)) {
+                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;
+            }
+        },
+        rowChange(val) {
+            this.currentRow = val;
+            this.selectedIndex = val.index;
+        },
+        tableCountChange(row) {
+            if (this.$isNotBlank(row)) {
+                // row.count = row.reCount;
+            }
+        },
+        tableRowClassName({row, rowIndex}) {
+            row.index = rowIndex;
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        deleteCodeArray(index, row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.$refs.multipleTable.setCurrentRow();
+                this.currentRow = {};
+                this.selectedIndex = "";
+
+                if (this.orderEditor) {
+                    this.detailLoading = true;
+                    if (this.$isNotBlank(row.id)) {
+                        delApplyDetail(row.id)
+                            .then(response => {
+                                this.detailLoading = false;
+                                if (response.code === 20000) {
+                                    this.$message.success(response.data);
+                                    // this.getStockOrderDetailList();
+                                    this.codeArray.splice(index, 1);
+                                } else {
+                                    this.$message.error(response.message);
+                                }
+                            })
+                            .catch(() => {
+                                this.detailLoading = false;
+                            })
+                    } else {
+                        this.$message.success('删除成功');
+                        this.codeArray.splice(index, 1);
+                    }
+                } else {
+                    this.$message.success('删除成功');
+                    this.codeArray.splice(index, 1);
+                }
+            }).catch(() => {
+
+            });
+        },
+        getStockOrderDetailList() {
+            this.loading = true;
+            listApplyDetail(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;
+                });
+        },
+        findSubInvs() {
+            this.subInvList = [];
+            let query = {
+                pcode: this.formData.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                    if (this.subInvList != null && this.subInvList.length == 1) {
+                        this.formData.invWarehouseCode = this.subInvList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+
+        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
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    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();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        targetInvChange() {
+            let query = {
+                code: this.formData.targetSubInv,
+                enabled: true,
+                spUse: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    // this.formData.targetBillAction = this.busTypes[0].localAction;
+                })
+                .catch(() => {
+                });
+        },
+
+    },
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.query.limit = 100;
+            this.query.orderIdFk = this.idQuery.id;
+            this.formData = this.idQuery.formData;
+            this.formData.targetInv = 1000;
+            this.orderEditor = true;
+            this.sValue = this.formData.corpName;
+            this.getStockOrderDetailList();
+        } else {
+            this.formData = {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                auditRemark: null,
+                autoPurchase: false,
+                targetInv: 1000,
+                targetSubInv: null,
+                targetBillAction: null,
+            };
+            this.orderEditor = false;
+        }
+        this.findTargetSubInvs();
+        this.codeArray = [];
+    },
+};
+</script>
+<style>
+
+.ao-text {
+    width: 100%;
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+    float: right;
+    text-align: right;
+    margin-top: 10px;
+}
+
+</style>
+
+
+

src/views/purchase/purPlan/purPlanEditDialog.vue

@@ -0,0 +1,493 @@
+<template>
+    <div>
+        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
+            <el-row type="flex" justify="end">
+                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+                    <el-button type="primary" @click.native="saveOrder('1')" :loading="loading">草稿保存</el-button>
+                    <el-button type="primary" @click.native="saveOrder('2')" :loading="loading">提交单据</el-button>
+                </el-button-group>
+            </el-row>
+
+            <el-card style="margin-top: -5px;">
+                <el-row>
+                    <el-col :span="11">
+                        <el-form-item label="单据号:" prop="billNo">
+                            <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-form-item label="单据时间:" prop="billdate">
+                            <el-date-picker
+                                v-model="formData.billDate"
+                                type="datetime"
+                                placeholder="选择日期"
+                                style="width: 100%"
+                                :clearable="false"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                            >
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row >
+                    <el-col :span="11">
+                        <el-form-item label="采购仓库:" prop="invCode">
+                            <el-select v-model="formData.invCode" @change="setDeptCode" placeholder="采购仓库信息" style="width: 100%"
+                                       clearable>
+                                <el-option
+                                    v-for="item in invCodeList"
+                                    :key="item.name"
+                                    :label="item.name"
+                                    :value="item.code">
+                                    <span style="float: left">{{ item.name }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="11">
+                        <el-form-item label="采购说明:" prop="billNo">
+                            <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row>
+                    <el-col :span="11" v-show="formData.status==4">
+                        <el-form-item label="拒绝原因:">
+                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+            </el-card>
+
+            <el-card>
+                <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="selectProductFunction()" :loading="loading">产品录入</el-button>
+                            <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>
+                        </el-button-group>
+
+
+                    </el-button-group>
+                </el-row>
+                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
+                    <el-table-column label="序号" type="index" width="50"></el-table-column>
+                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                    <el-table-column width="150" label="申购数量">
+                        <template slot-scope="scope">
+                            <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>
+                    </el-table-column>
+                    <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="操作"  width="120">
+                        <template slot-scope="scope">
+                            <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" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </el-form>
+
+        <el-dialog
+            title="产品录入"
+            :visible.sync="selectProductVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="80%"
+            v-if="selectProductVisible"
+            :append-to-body='true'
+        >
+            <purPlanProducts
+                :closeDialog="closeDialogC2"
+                :purType="1"
+                :pId="pId"
+                :data="thisData"
+            ></purPlanProducts>
+        </el-dialog>
+
+        <el-dialog
+            title="申购单据选入"
+            :visible.sync="selectApplyVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            width="80%"
+            append-to-body
+            v-if="selectApplyVisible"
+        >
+            <select-apply-list-dialog
+                :data="thisData"
+                :pId="pId"
+                :closeDialog="closeDialogC2"
+            ></select-apply-list-dialog>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
+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: {
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        idQuery: {
+            type: Object,
+            required: true,
+        },
+      isChang: {
+        type: Boolean,
+        required: true,
+      },
+    },
+    data() {
+        return {
+            code: "",
+            query: {
+                orderIdFk: "",
+                page: 1,
+                limit: 10,
+            },
+            formData: {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                locStorageCode: null,
+                invWarehouseCode: null,
+            },
+            pId:null,
+            formRules: {},
+            codeArray: [],
+            total: 0,
+            loading: false,
+            index: null,
+            formLoading: false,
+            formVisible: false,
+            deleteLoading: false,
+            orderNo: null,
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+            },
+            typeMap: {
+                1: "预入库",
+                2: "普通采购",
+            },
+            orderEditor: true,
+            sOptions: [],
+            sValue: [],
+            sList: [],
+            sLoading: false,
+            busTypes: [],
+            currentRow: {},
+            selectedIndex: "",
+            selectProductVisible: false,
+            thisData: {},
+            storageList: [],
+            invCodeList: [],
+            invQueryData: {},
+            selectApplyVisible: false
+        };
+    },
+    watch: {
+      isChang: function () {
+        this.$emit("cancelDialog", this.pId);
+      },
+    },
+    components: {
+        draggable,
+      purPlanProducts,
+        SelectApplyListDialog
+    },
+    methods: {
+        saveOrder(status) {
+
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    if (this.codeArray.length < 1) {
+                        this.$message.warning('未添加产品');
+                        return;
+                    }
+                    if (status === '2') {
+
+                        if (this.formData.billDate == "" || this.formData.billDate == 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("采购仓库不能为空！");
+                        }
+
+                        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 (status == "1") {
+                        this.submitFunction(status);
+                    } else {
+                        let tip = "是否确定提交订单?";
+                        this.$confirm(tip, "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning",
+                        }).then(() => {
+                            this.submitFunction(status);
+                        }).catch(() => {
+                            this.loading = false;
+                        });
+                    }
+                }
+            });
+        },
+        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 => {
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.$message.success(tMessage + "成功");
+                        this.closeDialog(true);
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                })
+        },
+        selectProductFunction() {
+            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() {
+            this.selectProductVisible = false;
+            this.selectApplyVisible = false;
+            this.query={
+              orderIdFk:this.pId
+            }
+          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;
+            this.selectedIndex = val.index;
+        },
+        tableCountChange(row) {
+          if (this.$isNotBlank(row)) {
+            updateDetail(this.currentRow);
+          }
+        },
+        tableRowClassName({row, rowIndex}) {
+            row.index = rowIndex;
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        deleteCodeArray(index, row) {
+            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            }).then(() => {
+                this.$refs.multipleTable.setCurrentRow();
+                this.currentRow = {};
+                this.selectedIndex = "";
+
+                if (this.orderEditor) {
+                    this.detailLoading = true;
+                    if (this.$isNotBlank(row.id)) {
+                        let delIds = [];
+                        delIds.push(row.id)
+                        delApplyDetail(delIds)
+                            .then(response => {
+                                this.detailLoading = false;
+                                if (response.code === 20000) {
+                                    this.$message.success(response.data);
+                                    // this.getStockOrderDetailList();
+                                    this.codeArray.splice(index, 1);
+                                } else {
+                                    this.$message.error(response.message);
+                                }
+                            })
+                            .catch(() => {
+                                this.detailLoading = false;
+                            })
+                    } else {
+                        this.$message.success('删除成功');
+                        this.codeArray.splice(index, 1);
+                    }
+                } else {
+                    this.$message.success('删除成功');
+                    this.codeArray.splice(index, 1);
+                }
+            }).catch(() => {
+
+            });
+        },
+        getStockOrderDetailList() {
+            this.loading = true;
+            listApplyDetail(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;
+                });
+        },
+        findSubInvs() {
+            this.invCodeList = [];
+            let query = {
+                filter:3
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.invCodeList = response.data || [];
+                    if (this.invCodeList != null && this.invCodeList.length == 1) {
+                        this.formData.invCode = this.invCodeList[0].code;
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        selectApply() {
+            this.selectApplyVisible = true;
+          //当父id为空的时候生成id
+          if(this.pId==null){
+            addPlanId().then(response => {
+              if (response.code === 20000) {
+                this.pId=response.data
+              }
+            }).catch(() => {
+              this.loading = false;
+            })
+          }
+        },
+    },
+    filters: {},
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    created() {
+
+        if (this.$isNotBlank(this.idQuery.id)) {
+            this.query.limit = 100;
+            this.pId=this.idQuery.id;
+            this.query.orderIdFk = this.idQuery.id;
+            this.formData = this.idQuery.formData;
+            this.orderEditor = true;
+            this.sValue = this.formData.corpName;
+            this.getStockOrderDetailList();
+        } else {
+            this.formData = {
+                id: null,
+                billNo: null,
+                billDate: "",
+                remark: "",
+                deptCode: null,
+                incCode: null,
+            };
+            this.orderEditor = false;
+        }
+        this.findSubInvs();
+        this.codeArray = [];
+    },
+};
+</script>
+<style>
+
+.ao-text {
+    width: 100%;
+    font-size: 13px;
+    font-family: "Microsoft YaHei";
+    float: right;
+    text-align: right;
+    margin-top: 10px;
+}
+
+</style>
+
+
+

src/views/purchase/purPlan/purPlanOrderSelectProduct.vue

@@ -0,0 +1,441 @@
+<template>
+    <div>
+        <el-card class="el-card">
+            <div>
+                <el-form :inline="true" :model="listQuery" size="mini">
+                    <el-row style="margin-top: 15px;width: 1000px">
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.udiCode"
+                                      style="width: 600px"
+                                      placeholder="请扫描或输入UDI码"
+                                      clearable="true"
+                                      @keyup.enter.native="keyup_submit($event)"></el-input>
+                        </el-form-item>
+                    </el-row>
+
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                                      clearable="true"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+                        </el-form-item>
+                    </el-row>
+
+                    <el-row>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                                      clearable="true"></el-input>
+                        </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input v-model="listQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <el-button-group>
+                                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                                <el-button type="primary" icon="search" @click="search">查询</el-button>
+                                <el-button type="primary" icon="search" @click="confirmSelect">确定</el-button>
+                            </el-button-group>
+                        </el-form-item>
+                    </el-row>
+                </el-form>
+
+                <el-table
+                    :data="dataList"
+                    style="width: 100%"
+                    highlight-current-row="false"
+                    v-loading="loading"
+                    :row-class-name="tableRowClassName"
+                    @current-change="handleChange"
+                    ref="multipleTable"
+                >
+                    <!--                    <el-table-column-->
+                    <!--                        type="selection"-->
+                    <!--                        width="55">-->
+                    <!--                    </el-table-column>-->
+                    <el-table-column label width="45">
+                        <template slot-scope="scope">
+                            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="序号" type="index"></el-table-column>
+                    <el-table-column
+                        label="最小销售产品标识"
+                        prop="nameCode"
+                        width="140"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="产品编码"
+                        prop="thirdId"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="医疗器械注册人"
+                        prop="ylqxzcrbarmc"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="产品通用名"
+                        prop="cpmctymc"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="规格型号"
+                        prop="ggxh"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="注册/备案凭证"
+                        prop="zczbhhzbapzbh"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="器械类别"
+                        prop="qxlb"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column
+                        label="配送企业"
+                        prop="companyName"
+                        show-overflow-tooltip
+                    ></el-table-column>
+                    <el-table-column label="操作" fixed="right" width="160">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click.native.stop="handleDetailClick(scope.row)"
+                            >详情
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-pagination
+                    :page-size="listQuery.limit"
+                    @current-change="handleErpPageChange"
+                    layout="prev, pager, next"
+                    :total="pageTotal"
+                    :current-page="listQuery.page"
+                ></el-pagination>
+            </div>
+        </el-card>
+        <el-dialog
+            title="耗材字典详情"
+            :visible.sync="udiRlDetailVisible"
+            width="85%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            append-to-body
+            v-if="udiRlDetailVisible"
+        >
+            <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
+        </el-dialog>
+
+        <el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
+            <el-form :model="form">
+                <el-form-item label="" prop="isGive">
+                    <el-radio-group v-model="currentCert">
+                        <el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="selectCert">确 定</el-button>
+                <el-button @click="dialogFormVisible = false">取 消</el-button>
+            </div>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {getStockOrderDetailInstrumentById, stockOrderDetailFilterProduct} from "../../../api/inout/stockOrder";
+import store from "../../../store";
+import udiRlDetailDialog from "./../../";
+import {addApplyDetail} from "@/api/purchase/purApply";
+
+export default {
+    name: "stockOrderNewSelectProduct",
+    props: {
+        data: {
+            type: Object,
+            required: true,
+        },
+        closeDialog: {
+            type: Function,
+            required: true,
+        },
+        purType: {
+            type: Object,
+            required: true,
+        },
+
+    },
+
+    data() {
+        return {
+            listQuery: {
+                udiCode: "",
+                unionCode: "",
+                cpmctymc: "",
+                ggxh: "",
+                ylqxzcrbarmc: "",
+                thrPiId: "",
+                page: 1,
+                limit: 10,
+            },
+            combineQuery: {
+                thirdId: "",
+                relId: "",
+                erpName: "",
+                keys: [],
+            },
+            ids: [],
+            radioCheck: null,
+            dataList: [],
+            pageTotal: 1,
+            total: 1,
+            currentRow: null,
+            loading: false,
+            udiRlDetailVisible: false,
+            thirdSys: [],
+            thirdSysFk: null,
+            busTypes: [],
+            actDateRange: [],
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+            orderEditor: false,
+            orderId: "",
+            currentCert: null,
+            certList: [],
+            dialogFormVisible: false,
+            multipleSelection: null,
+        };
+    },
+    methods: {
+        onReset() {
+            // this.$router.push({
+            //     path: "",
+            // });
+            this.listQuery = {
+                udiCode: "",
+                unionCode: "",
+                cpmctymc: "",
+                ggxh: "",
+                ylqxzcrbarmc: "",
+                thrPiId: "",
+                page: 1,
+                limit: 10,
+            },
+                this.getList();
+        },
+        tableRowClassName({row}) {
+            if (row.checked) return "warning-row";
+            return "";
+        },
+        checkSelectable(row) {
+            return !row.check;
+        },
+        handleCurrentChange(val) {
+            this.unionQuery.page = val;
+            this.getList();
+        },
+        handleChange(val) {
+            this.radioCheck = val.id;
+            this.currentRow = val;
+            this.multipleSelection = val
+        },
+        handleDetailClick(row) {
+            this.currentRow = row;
+            this.udiRlDetailVisible = true;
+
+        },
+        handleErpPageChange(val) {
+            this.listQuery.page = val;
+            this.getList();
+        },
+        keyup_submit(event) {
+            this.listQuery.page = 1;
+            this.getList();
+            event.target.select();
+        },
+        search() {
+            this.listQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+
+            this.loading = true;
+            this.listQuery.customerId = store.getters.customerId;
+            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+                this.listQuery.companyName=this.data.formData.corpName
+            }
+            if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){
+                this.listQuery.companyName=this.data.corpName
+            }
+
+            stockOrderDetailFilterProduct(this.listQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code === 20000) {
+                        this.dataList = response.data.list || [];
+                        this.pageTotal = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                        this.dataList = [];
+                        this.pageTotal = 0;
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.dataList = [];
+                    this.pageTotal = 0;
+                });
+        },
+        intentBack() {
+            this.closeDialog();
+        },
+
+
+        confirmSelect() {
+            if (this.multipleSelection == null) {
+                this.$message.error('未选择产品');
+                return;
+            }
+
+            if (this.ids.length > 0) {
+                for (var i = 0; i < this.ids.length; i++) {
+                    if (this.ids[i] == this.multipleSelection.rlId) {
+                        this.$message.error("该产品已录入！");
+                        return
+                    }
+                }
+            }
+
+            let str = this.multipleSelection.zczbhhzbapzbh;
+            if (str.search(",") != -1) {
+                this.currentCert = null;
+                this.certList = str.split(',');
+                this.dialogFormVisible = true;
+            } else {
+                this.combine();
+            }
+        },
+
+      combine() {
+        this.loading = true;
+        let tQuery = {
+          productId:this.multipleSelection.rlId,
+          productName:this.multipleSelection.cpmctymc,
+          count:1,
+          orderIdFk:this.pId,
+          supId:this.multipleSelection.customerId,
+          zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh
+        };
+        addPlanDetail(tQuery).then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.closeDialog(response.data);
+          } else {
+            if (response.code == 601) {
+              this.$alert(response.message, "提示", {
+                confirmButtonText: "确定",
+              });
+            } else
+              this.$message.error(response.message);
+          }
+        }).catch(() => {
+          this.loading = false;
+        });
+
+      },
+
+        selectCert() {
+            if (this.currentCert == null) {
+                this.$message.error("请先选择对应的注册证！");
+            } else {
+                this.multipleSelection.zczbhhzbapzbh = this.currentCert;
+                this.combine();
+            }
+
+        },
+    },
+    components: {udiRlDetailDialog},
+
+    created() {
+        if (this.$isNotBlank(this.data)) {
+
+            // this.listQuery.nameCode = this.data.udi;
+            // if (this.data.billType != null) {
+            //     this.listQuery.billType = this.data.billType;
+            // } else
+            //     this.listQuery.billType = this.data.formData.billType;
+
+            // if (this.data.formData != null) {
+            //     this.listQuery.corpId = this.data.formData.corpId;
+            // }
+            // this.orderEditor = this.data.orderEditor;
+            // this.orderId = this.data.orderId;
+            this.ids = [];
+            if (this.data.stockOrderLists.length > 0) {
+                for (var i = 0; i < this.data.stockOrderLists.length; i++) {
+                    this.ids.push(this.data.stockOrderLists[i].productId);
+                }
+            }
+        }
+        this.getList();
+    },
+};
+</script>
+
+<style scoped>
+.query-form-item {
+    display: block !important;
+    margin-right: 10px;
+    margin-bottom: 5px;
+}
+
+div /deep/ .el-table .warning-row {
+    background: #bebebe;
+}
+
+div /deep/ .el-table .success-row {
+    background: #ffffff;
+}
+</style>

src/views/purchase/purPlan/purPlanSearch.vue

@@ -0,0 +1,336 @@
+<template>
+    <div>
+        <el-card>
+            <el-form  :model="filterQuery" class="query-form" label-width="100px"  size="mini">
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="单据号">
+                        <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <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="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                        >
+                        </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%" 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>
+                <el-table-column label="采购日期" prop="billDate">
+                    <template slot-scope="scope">
+                        <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="创建人" prop="createByName"></el-table-column>
+                <el-table-column label="审核人" prop="auditByName"></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">
+                        <el-tag :type="(scope.row.status) | statusFilterType">
+                            {{ statusMap[scope.row.status] }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
+
+
+                <el-table-column label="操作" >
+                    <template slot-scope="scope">
+                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+                        >删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="filterQuery.page"
+            :limit.sync="filterQuery.limit"
+            @pagination="handleCurrentChange"
+
+          ></pagination>
+
+        </el-card>
+        <el-card class="el-card">
+            <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>
+                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="申购数量" prop="count"></el-table-column>
+                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-dialog
+            :title="formMap[formName]"
+            :visible.sync="newSpDistributionVisible"
+            width="80%"
+            v-if="newSpDistributionVisible"
+            @close='closeDialog'
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+        >
+            <purPlanEdit
+                :closeDialog="closeDialog"
+                :idQuery="idQuery"
+                :editType="editType"
+            ></purPlanEdit>
+
+
+        </el-dialog>
+    </div>
+</template>
+<script>
+import purPlanEdit from "./purPlanDetailDialog";
+import {delApply, listPlan, listApplyDetail, delPlanDetailAll} from "@/api/purchase/purPlan";
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                billAction: null,
+                billNo: "",
+                originType: null,
+                thirdSysFk: "",
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            },
+            formName: null,
+            formMap: {
+                add: "新增采购计划",
+                update: "采购计划审核",
+            },
+            statusMap: {
+                1: "草稿",
+                2: "未审核",
+                3: "已审核",
+                4: "已拒绝"
+            },
+            idQuery: {},
+            editType: 1,
+            total: 0,
+            thirdSys: [],
+            thirdSysDetail: null,
+            busTypes: [],
+            originTypes: [],
+            list: [],
+            detailList: [],
+            loading: false,
+            actDateRange: [],
+            newSpDistributionVisible: false,
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            },
+        };
+    },
+
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                billNo: "",
+                thirdSysFk: "",
+                billFlag: null,
+                billAction: null,
+                startDate: null,
+                endDate: null,
+                page: 1,
+                limit: 10,
+                corpName: null,
+                type: 1,
+                editStatus: 1,
+            };
+            this.actDateRange = [];
+            this.getList();
+        },
+
+        onSubmitFind() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
+
+        getList() {
+            if (this.actDateRange != null) {
+                this.filterQuery.startDate = this.actDateRange[0];
+                this.filterQuery.endDate = this.actDateRange[1];
+            } else {
+                this.filterQuery.startDate = null;
+                this.filterQuery.endDate = null;
+            }
+            this.loading = true;
+            this.filterQuery.status = 3;
+            listPlan(this.filterQuery)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        handleDetail(row) {
+            let query = {orderIdFk: row.id};
+            this.loading = true;
+            listApplyDetail(query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.detailList = response.data.list || [];
+                    this.loading = false;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.detailList = [];
+                    this.total = 0;
+                });
+        },
+        deleteDialog(row) {
+            this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                  delPlanDetailAll(row.id)
+                        .then((response) => {
+                            this.loading = false;
+                            if (response.code == 20000) {
+                                this.$message.success("删除成功");
+                                this.getList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        });
+
+                })
+                .catch(() => {
+                });
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val.page;
+            this.getList();
+        },
+
+        closeDialog() {
+            this.newSpDistributionVisible = false;
+            this.getList();
+            this.detailList = [];
+        },
+
+
+        newDistributionForm(index, row) {
+            this.idQuery.id = '';
+            if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+                this.idQuery.id = row.id;
+                this.idQuery.formData = row;
+                this.formName = "update";
+            } else
+                this.formName = "add";
+            this.newSpDistributionVisible = true;
+        },
+
+    }
+    ,
+    components: {
+        purPlanEdit,
+    }
+    ,
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                2: "warning",
+                3: "success",
+                4: "danger",
+            };
+            return statusMap[status];
+        }
+        ,
+    }
+    ,
+    mounted() {
+    }
+    ,
+    created() {
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
+        this.getList();
+    }
+    ,
+}
+;
+</script>
+<style scoped>
+
+</style>
+

src/views/thirdSys/corps/thrCorpSelect.vue

@@ -240,7 +240,7 @@ export default {
             this.$message.error(response.message)
           }
           this.$emit("cancelDialog", true);
-        })
+    })
         .catch(() => {
           this.$message.error("下载失败！");
         });