From 6c9b9988c4504940faf5cbfeea032de1914fa0d9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 6 Nov 2023 09:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=82=A3=E8=80=85?=
 =?UTF-8?q?=E5=A4=84=E6=96=B9=E7=AD=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   2 +
 src/api/basic/basicDestinyRel.js              | 100 ++---
 src/api/inout/ioDestinyProcess.js             |  60 +--
 src/views/basic/destiny/destiny.vue           |  88 ++---
 src/views/basic/destiny/skProject.vue         | 362 ++++++++++++++++++
 src/views/basic/sicker/skPerson.vue           | 361 +++++++++++++++++
 .../inventory/InvPreInProductsDetail.vue      |  62 +++
 src/views/inventory/InvPreProductsDetail.vue  |  70 +++-
 src/views/inventory/InvProductsDetail.vue     | 155 +++++---
 9 files changed, 1089 insertions(+), 171 deletions(-)
 create mode 100644 src/views/basic/destiny/skProject.vue
 create mode 100644 src/views/basic/sicker/skPerson.vue

diff --git a/.env.production b/.env.production
index 04d349ea..63b005d4 100644
--- a/.env.production
+++ b/.env.production
@@ -27,6 +27,8 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 # 平和县医院
 # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/'
 
+VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/api/basic/basicDestinyRel.js b/src/api/basic/basicDestinyRel.js
index f8b24261..653f9413 100644
--- a/src/api/basic/basicDestinyRel.js
+++ b/src/api/basic/basicDestinyRel.js
@@ -1,84 +1,84 @@
 import axios from "@/utils/request";
 
 export function getBasicDestinyfilter(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function addModeldestiny(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/addModeldestiny",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/addModeldestiny",
+    method: "post",
+    data: query
+  });
 }
 
 export function editModeldestiny(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/editModeldestiny",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/editModeldestiny",
+    method: "post",
+    data: query
+  });
 }
 
 export function delectModeldestiny(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/delectModeldestiny",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/delectModeldestiny",
+    method: "post",
+    data: query
+  });
 }
 
 export function filterDestinyProduct(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/product/filter",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/product/filter",
+    method: "get",
+    params: query
+  });
 }
 
 export function addModeldestinyProduct(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/addModeldestinyProduct",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/addModeldestinyProduct",
+    method: "post",
+    data: query
+  });
 }
 
 
 export function filterDestinyDelect(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/filterDestinyDelect",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/filterDestinyDelect",
+    method: "get",
+    params: query
+  });
 }
 
 export function delectModeldestinyProduct(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/delectModeldestinyProduct",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/delectModeldestinyProduct",
+    method: "get",
+    params: query
+  });
 }
 
 export function uploadModeldestinyProduct(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/uploadModeldestinyProduct",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/uploadModeldestinyProduct",
+    method: "post",
+    data: query
+  });
 }
 
 export function addDestinyProcess(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/addDestinyProcess",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/addDestinyProcess",
+    method: "get",
+    params: query
+  });
 }
 
 
diff --git a/src/api/inout/ioDestinyProcess.js b/src/api/inout/ioDestinyProcess.js
index 2f0e421b..fd18b9c9 100644
--- a/src/api/inout/ioDestinyProcess.js
+++ b/src/api/inout/ioDestinyProcess.js
@@ -2,53 +2,53 @@ import axios from '@/utils/request'
 
 
 export function addDestinyDelect(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/addDestinyDelect",
-        method: "post",
-        data: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/addDestinyDelect",
+    method: "post",
+    data: query
+  });
 }
 
 export function filterDestinyDelect(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/filterDestinyProcessDelect",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/filterDestinyProcessDelect",
+    method: "get",
+    params: query
+  });
 }
 
 export function filterDestinyProcess(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/filterDestinyProcess",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/filterDestinyProcess",
+    method: "get",
+    params: query
+  });
 }
 
 export function checkDestinyProcess(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/checkDestinyProcess",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/checkDestinyProcess",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function filterDestinyProcessCode(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/filterDestinyProcessCode",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/filterDestinyProcessCode",
+    method: "get",
+    params: query
+  });
 }
 
 
 export function delectDestinyProcess(query) {
-    return axios({
-        url: "/udiwms/basic/destiny/model/delectDestinyProcess",
-        method: "get",
-        params: query
-    });
+  return axios({
+    url: "/udiwms/basic/destiny/model/delectDestinyProcess",
+    method: "get",
+    params: query
+  });
 }
 
 
diff --git a/src/views/basic/destiny/destiny.vue b/src/views/basic/destiny/destiny.vue
index 58f290b6..24b31cb7 100644
--- a/src/views/basic/destiny/destiny.vue
+++ b/src/views/basic/destiny/destiny.vue
@@ -43,11 +43,11 @@
       </el-table>
 
       <pagination
-          v-show="total>0"
-          :total="total"
-          :limit.sync="filterQuery.limit"
-          :page.sync="filterQuery.page"
-          @pagination="handleCurrentChange"
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
       ></pagination>
     </el-card>
 
@@ -64,42 +64,42 @@
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
       </el-table>
       <pagination
-          v-show="delectTotal>0"
-          :total="delectTotal"
-          :limit.sync="delectQuery.limit"
-          :page.sync="delectQuery.page"
-          @pagination="handleCurrentDelectChange"
+        v-show="delectTotal>0"
+        :total="delectTotal"
+        :limit.sync="delectQuery.limit"
+        :page.sync="delectQuery.page"
+        @pagination="handleCurrentDelectChange"
       ></pagination>
     </el-card>
 
     <el-dialog
-        :title="formMap[formName]"
-        :visible.sync="formVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="40%"
-        :before-close="closeDialog"
-        v-if="formVisible"
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="40%"
+      :before-close="closeDialog"
+      v-if="formVisible"
     >
       <destinyModelEdit
-          :editQuery="editQuery"
-          :closeDialog="closeDialog"
+        :editQuery="editQuery"
+        :closeDialog="closeDialog"
       ></destinyModelEdit>
     </el-dialog>
 
     <el-dialog
-        title="选入产品"
-        :visible.sync="selectFormVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        :before-close="closeDialog"
-        v-if="selectFormVisible"
+      title="选入产品"
+      :visible.sync="selectFormVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      :before-close="closeDialog"
+      v-if="selectFormVisible"
     >
       <destinyModelSelectProduct
-          :editQuery="editQuery"
-          :codeArray="codeArray"
-          :closeDialog="closeDialog"
+        :editQuery="editQuery"
+        :codeArray="codeArray"
+        :closeDialog="closeDialog"
       ></destinyModelSelectProduct>
     </el-dialog>
 
@@ -220,7 +220,7 @@ export default {
       this.formVisible = false;
       this.selectFormVisible = false;
       this.getList();
-      this.delectList=[]
+      this.delectList = []
       this.editQuery = {}
     },
     handleDetail(row) {
@@ -229,22 +229,22 @@ export default {
     },
     filterDestinyDelect() {
       filterDestinyDelect(this.delectQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code === 20000) {
-              this.delectList = response.data.list || [];
-              this.delectTotal = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-              this.delectList = [];
-              this.delectTotal = 0;
-            }
-          })
-          .catch(() => {
-            this.loading = false;
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.delectList = response.data.list || [];
+            this.delectTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
             this.delectList = [];
             this.delectTotal = 0;
-          });
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.delectList = [];
+          this.delectTotal = 0;
+        });
     },
   }
   ,
diff --git a/src/views/basic/destiny/skProject.vue b/src/views/basic/destiny/skProject.vue
new file mode 100644
index 00000000..f2058a73
--- /dev/null
+++ b/src/views/basic/destiny/skProject.vue
@@ -0,0 +1,362 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="项目名称:" class="query-form-item">
+              <el-input v-model="filterQuery.name" placeholder="请输入项目名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编码:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入项目编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button-group>
+                <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-plus" @click="handleAddClick">新增</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
+                style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="项目编码" prop="code" width="140"></el-table-column>
+        <el-table-column label="项目名称" prop="name" width="160"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="180"></el-table-column>
+        <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="160"></el-table-column>
+        <el-table-column label="操作" width="160" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
+            <!--            <el-button type="text" size="small" @click.native.stop="selectDialog(scope.row)">选入产品</el-button>-->
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+
+    <el-card>
+
+      <el-row>
+        <el-col :span="24">
+          <el-button type="primary" style="float: right;margin-bottom: 12px;margin-right: 20px" size="small"
+                     icon="search" @click="selectProduct">新增产品
+          </el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品DI" prop="nameCode"></el-table-column>
+        <el-table-column label="产品编码" prop="thirdId"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+        <el-table-column label="计量单位" prop="measname"></el-table-column>
+        <el-table-column label="数量" prop="count">
+          <template slot-scope="scope">
+            <el-input size="small" v-model="scope.row.count"
+                      placeholder="请输入数量" style="width: 80%"
+                      type='number'
+                      :disabled="scope.row.index !== selectedIndex"
+                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="操作" width="220">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex"
+                       @click.native.stop="rowChange(scope.row)">编辑
+            </el-button>
+            <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                       @click.native="tableCountChange(scope.row)">保存
+            </el-button>
+            <el-button type="text" size="small" @click.native.stop="delectModifyClick(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="delectTotal>0"
+        :total="delectTotal"
+        :limit.sync="delectQuery.limit"
+        :page.sync="delectQuery.page"
+        @pagination="handleCurrentDelectChange"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="40%"
+      :before-close="closeDialog"
+      v-if="formVisible"
+    >
+      <destinyModelEdit
+        :editQuery="editQuery"
+        :closeDialog="closeDialog"
+      ></destinyModelEdit>
+    </el-dialog>
+
+    <el-dialog
+      title="选入产品"
+      :visible.sync="selectFormVisible"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      :before-close="closeProudDialog"
+      v-if="selectFormVisible"
+    >
+      <destinySelectProduct
+        :editQuery="editLogin"
+        :closeDialog="closeProudDialog"
+      ></destinySelectProduct>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  addModeldestiny,
+  delectModeldestiny, delectModeldestinyProduct,
+  filterDestinyDelect,
+  getBasicDestinyfilter, uploadModeldestinyProduct
+} from "@/api/basic/basicDestinyRel";
+import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
+import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
+import destinySelectProduct from "@/views/basic/destiny/destinySelectProduct";
+
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      editType: "",
+      formVisible: false,
+      selectFormVisible: false,
+      loading: false,
+      formName: "",
+      total: 0,
+      list: [],
+      codeArray: [],
+      editQuery: {},
+      formMap: {
+        "add": "物资项目-新增",
+        "edit": "物资项目-编辑"
+      },
+      delectQuery: {
+        id: null,
+        page: 1,
+        limit: 20
+      },
+      delectList: [],
+      delectTotal: 0,
+      selectedIndex: '',
+
+      editLogin: {
+        id: null,
+        cpmctymc: null,
+        ids: [],
+        page: 1,
+        limit: 10,
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getBasicDestinyfilter(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data.list || [];
+        this.total = response.data.total || 0;
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+        this.roles = [];
+      });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCurrentDelectChange(val) {
+      this.delectQuery.page = val.page;
+      this.filterDestinyDelect()
+    },
+    handleAddClick() {
+      this.formName = "add";
+      this.formVisible = true;
+    },
+    handleModifyClick(row) {
+      this.formName = "edit";
+      this.formVisible = true;
+      this.editQuery = row;
+    },
+    deleteDialog(row) {
+      this.$confirm("删除该项目,项目底下所有产品也会被移除，是否确定删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        delectModeldestiny(row).then(res => {
+          if (res.code == 20000) {
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(() => {
+          this.$message.error("删除失败！");
+        });
+      }).catch(() => {
+      });
+
+
+    },
+    selectDialog(row) {
+      this.selectFormVisible = true;
+      this.editQuery = row;
+    },
+    closeDialog() {
+      this.formVisible = false;
+      this.selectFormVisible = false;
+      this.getList();
+      this.delectList = []
+      this.editQuery = {}
+    },
+    handleDetail(row) {
+      this.delectQuery.id = row.id
+      this.editQuery = row;
+      this.filterDestinyDelect()
+    },
+    filterDestinyDelect() {
+      filterDestinyDelect(this.delectQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.delectList = response.data.list || [];
+            this.delectTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.delectList = [];
+            this.delectTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.delectList = [];
+          this.delectTotal = 0;
+        });
+    },
+    rowChange(val) {
+      this.selectedIndex = val.index
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        var query = {
+          id: row.deId,
+          count: row.count
+        }
+        uploadModeldestinyProduct(query);
+        this.selectedIndex = null
+      }
+    },
+    delectModifyClick(row) {
+      this.$confirm("是否确定移除该产品?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        let tquery = {
+          id: row.deId
+        };
+        delectModeldestinyProduct(tquery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.filterDestinyDelect();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    },
+    selectProduct() {
+      this.editLogin.id = this.editQuery.id
+      this.selectFormVisible = true;
+    },
+    closeProudDialog() {
+      this.selectFormVisible = false;
+      this.filterDestinyDelect();
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    destinyModelEdit, destinyModelSelectProduct, destinySelectProduct
+  }
+  ,
+  created() {
+    this.getList();
+  }
+}
+;
+</script>
diff --git a/src/views/basic/sicker/skPerson.vue b/src/views/basic/sicker/skPerson.vue
new file mode 100644
index 00000000..982cf63a
--- /dev/null
+++ b/src/views/basic/sicker/skPerson.vue
@@ -0,0 +1,361 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" label-width="100px" size="mini">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="项目名称:" class="query-form-item">
+              <el-input v-model="filterQuery.name" placeholder="请输入项目名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编码:" class="query-form-item">
+              <el-input v-model="filterQuery.code" placeholder="请输入项目编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button-group>
+                <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-plus" @click="handleAddClick">新增</el-button>
+              </el-button-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
+                style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="项目编码" prop="code" width="140"></el-table-column>
+        <el-table-column label="项目名称" prop="name" width="160"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="180"></el-table-column>
+        <el-table-column label="创建人" prop="createByName" width="140"></el-table-column>
+        <el-table-column label="创建时间" prop="createTime" width="160"></el-table-column>
+        <el-table-column label="操作" width="160" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="handleModifyClick(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"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+
+    <el-card>
+
+      <el-row>
+        <el-col :span="24">
+          <el-button type="primary" style="float: right;margin-bottom: 12px;margin-right: 20px" size="small"
+                     icon="search" @click="selectProduct">新增产品
+          </el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="产品DI" prop="nameCode"></el-table-column>
+        <el-table-column label="产品编码" prop="thirdId"></el-table-column>
+        <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh"></el-table-column>
+        <el-table-column label="计量单位" prop="measname"></el-table-column>
+        <el-table-column label="数量" prop="count">
+          <template slot-scope="scope">
+            <el-input size="small" v-model="scope.row.count"
+                      placeholder="请输入数量" style="width: 80%"
+                      type='number'
+                      :disabled="scope.row.index !== selectedIndex"
+                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="操作" width="220">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex"
+                       @click.native.stop="rowChange(scope.row)">编辑
+            </el-button>
+            <el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
+                       @click.native="tableCountChange(scope.row)">保存
+            </el-button>
+            <el-button type="text" size="small" @click.native.stop="delectModifyClick(scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="delectTotal>0"
+        :total="delectTotal"
+        :limit.sync="delectQuery.limit"
+        :page.sync="delectQuery.page"
+        @pagination="handleCurrentDelectChange"
+      ></pagination>
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="40%"
+      :before-close="closeDialog"
+      v-if="formVisible"
+    >
+      <destinyModelEdit
+        :editQuery="editQuery"
+        :closeDialog="closeDialog"
+      ></destinyModelEdit>
+    </el-dialog>
+
+    <el-dialog
+      title="选入产品"
+      :visible.sync="selectFormVisible"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      :before-close="closeProudDialog"
+      v-if="selectFormVisible"
+    >
+      <destinySelectProduct
+        :editQuery="editLogin"
+        :closeDialog="closeProudDialog"
+      ></destinySelectProduct>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  addModeldestiny,
+  delectModeldestiny, delectModeldestinyProduct,
+  filterDestinyDelect,
+  getBasicDestinyfilter, uploadModeldestinyProduct
+} from "@/api/basic/basicDestinyRel";
+import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
+import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
+import destinySelectProduct from "@/views/basic/destiny/destinySelectProduct";
+
+
+export default {
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      },
+      editType: "",
+      formVisible: false,
+      selectFormVisible: false,
+      loading: false,
+      formName: "",
+      total: 0,
+      list: [],
+      codeArray: [],
+      editQuery: {},
+      formMap: {
+        "add": "物资项目-新增",
+        "edit": "物资项目-编辑"
+      },
+      delectQuery: {
+        id: null,
+        page: 1,
+        limit: 20
+      },
+      delectList: [],
+      delectTotal: 0,
+      selectedIndex: '',
+
+      editLogin: {
+        id: null,
+        cpmctymc: null,
+        ids: [],
+        page: 1,
+        limit: 10,
+      },
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.filterQuery = {
+        name: "",
+        code: "",
+        type: 2,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getBasicDestinyfilter(this.filterQuery).then(response => {
+        this.loading = false;
+        this.list = response.data.list || [];
+        this.total = response.data.total || 0;
+      }).catch(() => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+        this.roles = [];
+      });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCurrentDelectChange(val) {
+      this.delectQuery.page = val.page;
+      this.filterDestinyDelect()
+    },
+    handleAddClick() {
+      this.formName = "add";
+      this.formVisible = true;
+    },
+    handleModifyClick(row) {
+      this.formName = "edit";
+      this.formVisible = true;
+      this.editQuery = row;
+    },
+    deleteDialog(row) {
+      this.$confirm("删除该项目,项目底下所有产品也会被移除，是否确定删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        delectModeldestiny(row).then(res => {
+          if (res.code == 20000) {
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(() => {
+          this.$message.error("删除失败！");
+        });
+      }).catch(() => {
+      });
+
+
+    },
+    selectDialog(row) {
+      this.selectFormVisible = true;
+      this.editQuery = row;
+    },
+    closeDialog() {
+      this.formVisible = false;
+      this.selectFormVisible = false;
+      this.getList();
+      this.delectList = []
+      this.editQuery = {}
+    },
+    handleDetail(row) {
+      this.delectQuery.id = row.id
+      this.editQuery = row;
+      this.filterDestinyDelect()
+    },
+    filterDestinyDelect() {
+      filterDestinyDelect(this.delectQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.delectList = response.data.list || [];
+            this.delectTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.delectList = [];
+            this.delectTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.delectList = [];
+          this.delectTotal = 0;
+        });
+    },
+    rowChange(val) {
+      this.selectedIndex = val.index
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        var query = {
+          id: row.deId,
+          count: row.count
+        }
+        uploadModeldestinyProduct(query);
+        this.selectedIndex = null
+      }
+    },
+    delectModifyClick(row) {
+      this.$confirm("是否确定移除该产品?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.loading = true;
+        let tquery = {
+          id: row.deId
+        };
+        delectModeldestinyProduct(tquery)
+          .then((response) => {
+            this.loading = false;
+            if (response.code === 20000) {
+              this.filterDestinyDelect();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            this.certLoading = false;
+          });
+      }).catch(() => {
+      });
+    },
+    selectProduct() {
+      this.editLogin.id = this.editQuery.id
+      this.selectFormVisible = true;
+    },
+    closeProudDialog() {
+      this.selectFormVisible = false;
+      this.filterDestinyDelect();
+    },
+  }
+  ,
+  mounted() {
+  }
+  ,
+  components: {
+    destinyModelEdit, destinyModelSelectProduct, destinySelectProduct
+  }
+  ,
+  created() {
+    this.getList();
+  }
+}
+;
+</script>
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index e766246c..3658cde9 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -48,7 +48,28 @@
                   style="width: 100%"
         ></el-input>
       </el-form-item>
+      <el-form-item class="query-form-item" label="出入库类型:">
+        <el-select v-model="invPreProductDetailQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="入库" value="WareHouseIn"></el-option>
+          <el-option label="出库" value="WareHouseOut"></el-option>
+        </el-select>
+      </el-form-item>
 
+      <el-form-item class="query-form-item" label="单据时间:">
+        <el-date-picker
+          :picker-options="pickerOptions"
+          v-model="actDateRange"
+          type="daterange"
+          format="yyyy 年 MM 月 dd 日"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 90%"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button-group>
           <el-button type="primary" icon="search" @click="onSubmit"
@@ -159,6 +180,38 @@ export default {
       total: 0,
       loading: false,
       defaultSort: {prop: 'orderTime', order: 'desc'},
+      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]);
+            },
+          },
+        ],
+      },
     };
   },
   methods: {
@@ -167,6 +220,7 @@ export default {
         path: "",
       });
       this.invPreProductDetailQuery = {
+        mainAction: null,
         code: null,
         relId: null,
         supId: null,
@@ -178,6 +232,7 @@ export default {
         price: null,
       };
       this.getList();
+      this.actDateRange = [];
     },
     onSubmit() {
       this.invPreProductDetailQuery.page = 1;
@@ -207,6 +262,13 @@ export default {
 
     getList() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.invPreProductDetailQuery.startTime = this.actDateRange[0];
+        this.invPreProductDetailQuery.endTime = this.actDateRange[1];
+      } else {
+        this.invPreProductDetailQuery.startTime = null;
+        this.invPreProductDetailQuery.endTime = null;
+      }
       this.invPreProductDetailQuery.relId = this.inputQuery.relId;
       this.invPreProductDetailQuery.invSpaceCode = this.inputQuery.invSpaceCode;
       this.invPreProductDetailQuery.supId = this.inputQuery.supId;
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index ed73aba7..fea61cca 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -48,7 +48,27 @@
                   style="width: 100%"
         ></el-input>
       </el-form-item>
-
+      <el-form-item class="query-form-item" label="出入库类型:">
+        <el-select v-model="invPreProductDetailQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="入库" value="WareHouseIn"></el-option>
+          <el-option label="出库" value="WareHouseOut"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="query-form-item" label="单据时间:">
+        <el-date-picker
+          :picker-options="pickerOptions"
+          v-model="actDateRange"
+          type="daterange"
+          format="yyyy 年 MM 月 dd 日"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 90%"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button-group>
           <el-button type="primary" icon="search" @click="onSubmit"
@@ -145,6 +165,7 @@ export default {
   data() {
     return {
       invPreProductDetailQuery: {
+        mainAction: null,
         code: null,
         relId: null,
         supId: null,
@@ -153,12 +174,44 @@ export default {
         invCode: null,
         page: 1,
         limit: 10,
-        price:null,
+        price: null,
         defaultSort: {prop: 'orderTime', order: 'desc'},
       },
       list: [],
       total: 0,
       loading: false,
+      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]);
+            },
+          },
+        ],
+      },
     };
   },
   methods: {
@@ -167,6 +220,7 @@ export default {
         path: "",
       });
       this.invPreProductDetailQuery = {
+        mainAction: null,
         code: null,
         relId: null,
         supId: null,
@@ -175,10 +229,11 @@ export default {
         invCode: null,
         page: 1,
         limit: 10,
-        price:null,
+        price: null,
         defaultSort: {prop: 'orderTime', order: 'desc'},
       };
       this.getList();
+      this.actDateRange = [];
     },
     onSubmit() {
       this.invPreProductDetailQuery.page = 1;
@@ -214,6 +269,15 @@ export default {
       this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
       this.invPreProductDetailQuery.price = this.inputQuery.price;
+
+      if (this.actDateRange !== null) {
+        this.invPreProductDetailQuery.startTime = this.actDateRange[0];
+        this.invPreProductDetailQuery.endTime = this.actDateRange[1];
+      } else {
+        this.invPreProductDetailQuery.startTime = null;
+        this.invPreProductDetailQuery.endTime = null;
+      }
+
       // this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
       getInvPreProductDetail(this.invPreProductDetailQuery).then((res) => {
         this.loading = false;
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 5a089fc8..66e9c888 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -47,6 +47,29 @@
                   style="width: 100%"
         ></el-input>
       </el-form-item>
+      <el-form-item class="query-form-item" label="出入库类型:">
+        <el-select v-model="invProductDetailQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="入库" value="WareHouseIn"></el-option>
+          <el-option label="出库" value="WareHouseOut"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item class="query-form-item" label="单据时间:">
+        <el-date-picker
+            :picker-options="pickerOptions"
+            v-model="actDateRange"
+            type="daterange"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            style="width: 90%"
+        >
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button-group>
           <el-button type="primary" icon="search" @click="onSubmit"
@@ -62,67 +85,67 @@
               border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
-        label="UDI码"
-        prop="code"
-        width="350"
-        show-overflow-tooltip
+          label="UDI码"
+          prop="code"
+          width="350"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="出入库单号"
-        prop="orderId"
-        width="180"
-        show-overflow-tooltip
+          label="出入库单号"
+          prop="orderId"
+          width="180"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="单据类型"
-        prop="actionName"
-        width="150"
+          label="单据类型"
+          prop="actionName"
+          width="150"
       ></el-table-column>
       <el-table-column
-        label="出入库类型"
-        prop="mainActionStr"
-        width="120"
-        show-overflow-tooltip
+          label="出入库类型"
+          prop="mainActionStr"
+          width="120"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="货位"
-        prop="invSpaceName"
-        width="120"
-        show-overflow-tooltip
+          label="货位"
+          prop="invSpaceName"
+          width="120"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="价格"
-        prop="price"
-        width="120"
-        show-overflow-tooltip
+          label="价格"
+          prop="price"
+          width="120"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="入库数量"
-        prop="inCount"
-        width="120"
-        show-overflow-tooltip
+          label="入库数量"
+          prop="inCount"
+          width="120"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="出库数量"
-        prop="outCount"
-        width="120"
-        show-overflow-tooltip
+          label="出库数量"
+          prop="outCount"
+          width="120"
+          show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="单据日期"
-        prop="orderTime"
-        :sort-orders="['ascending', 'descending']"
-        sortable="custom"
-        width="150"
-        show-overflow-tooltip
+          label="单据日期"
+          prop="orderTime"
+          :sort-orders="['ascending', 'descending']"
+          sortable="custom"
+          width="150"
+          show-overflow-tooltip
       ></el-table-column>
     </el-table>
     <pagination
-      v-show="total>0"
-      :total="total"
-      :limit.sync="invProductDetailQuery.limit"
-      :page.sync="invProductDetailQuery.page"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :limit.sync="invProductDetailQuery.limit"
+        :page.sync="invProductDetailQuery.page"
+        @pagination="getList"
     ></pagination>
 
   </div>
@@ -143,13 +166,14 @@ export default {
   data() {
     return {
       invProductDetailQuery: {
+        mainAction: null,
         code: null,
         relId: null,
         supId: null,
         batchNo: null,
         deptCode: null,
         invCode: null,
-        price:null,
+        price: null,
         page: 1,
         limit: 10
       },
@@ -157,6 +181,38 @@ export default {
       total: 0,
       loading: false,
       defaultSort: {prop: 'orderTime', order: 'desc'},
+      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]);
+            },
+          },
+        ],
+      },
     };
   },
   methods: {
@@ -165,17 +221,19 @@ export default {
         path: "",
       });
       this.invProductDetailQuery = {
+        mainAction: null,
         code: null,
         relId: null,
         supId: null,
         batchNo: null,
         deptCode: null,
         invCode: null,
-        price:null,
+        price: null,
         page: 1,
         limit: 10
       };
       this.getList();
+      this.actDateRange = [];
     },
     onSubmit() {
       this.invProductDetailQuery.page = 1;
@@ -200,11 +258,20 @@ export default {
         this.invProductDetailQuery.sort = 'asc'
       }
       this.invProductDetailQuery.orderBy = column.prop;
+
+
       this.getList();
     },
 
     getList() {
       this.loading = true;
+      if (this.actDateRange !== null) {
+        this.invProductDetailQuery.startTime = this.actDateRange[0];
+        this.invProductDetailQuery.endTime = this.actDateRange[1];
+      } else {
+        this.invProductDetailQuery.startTime = null;
+        this.invProductDetailQuery.endTime = null;
+      }
       this.invProductDetailQuery.relId = this.inputQuery.relId;
       this.invProductDetailQuery.supId = this.inputQuery.supId;
       this.invProductDetailQuery.invSpaceCode = this.inputQuery.invSpaceCode;