From 3e45eca2fd23a967e94d95ae842b4df8376b4cbe Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 30 Oct 2023 19:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=9B=B8=E5=85=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   4 +-
 src/api/system/invSubWarehouse.js             |   9 +
 src/views/inout/DialogSelectInvProduct.vue    | 109 ++++++---
 src/views/inout/DialogSelectReceiveOrder.vue  |  55 +++--
 src/views/inout/IoCreateBusOrder.vue          |   2 +-
 src/views/inout/receive/DialogNewReceive.vue  | 208 +++++++++---------
 src/views/inout/receive/receiveAudit.vue      |   6 +-
 src/views/inout/receive/receiveMySearch.vue   |   1 +
 src/views/inout/receive/receiveSearch.vue     |   8 +-
 .../inventory/InvPreInProductsDetail.vue      |  13 +-
 src/views/inventory/InvPreProductsDetail.vue  |  12 +-
 src/views/inventory/InvProductsDetail.vue     |   7 +
 .../purApply/purOrderSelectProduct.vue        |   6 +-
 src/views/system/dept/authDept.vue            |  26 ++-
 src/views/system/dept/invWarehouse.vue        |  37 ++--
 src/views/system/menu/index.vue               |  11 +-
 16 files changed, 295 insertions(+), 219 deletions(-)

diff --git a/.env.production b/.env.production
index 118755df..95d63315 100644
--- a/.env.production
+++ b/.env.production
@@ -8,7 +8,7 @@ ENV = 'production'
 
 
 #林纪裕cd
-# VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
@@ -30,7 +30,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器.
 
diff --git a/src/api/system/invSubWarehouse.js b/src/api/system/invSubWarehouse.js
index cbaf51d3..2ba37bb2 100644
--- a/src/api/system/invSubWarehouse.js
+++ b/src/api/system/invSubWarehouse.js
@@ -49,6 +49,15 @@ export function findByUp(query) {
 }
 
 
+export function findLyInv(query) {
+  return axios({
+    url: "/spms/inv/warehouse/findLyInv",
+    method: "get",
+    params: query
+  });
+}
+
+
 export function filterSubByInv(query) {
   return axios({
     url: "/spms/inv/warehouse/findByUser",
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index edb361a7..eb4b8c9a 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -1,17 +1,17 @@
 <template>
   <div>
     <el-card>
-      <el-form  :model="filterQuery"  size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-          <el-form-item label="产品标识DI:">
-            <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入产品标识DI"></el-input>
-          </el-form-item>
+            <el-form-item label="DI/物资编码:">
+              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="6">
-          <el-form-item label="产品名称:">
-            <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品名称"></el-input>
-          </el-form-item>
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="规格型号:">
@@ -19,9 +19,36 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-          <el-form-item label="批次号:">
-            <el-input v-model="filterQuery.batchNo" style="width: 90%" placeholder="请输入批次号"></el-input>
-          </el-form-item>
+            <el-form-item label="批次号:">
+              <el-input v-model="filterQuery.batchNo" style="width: 90%" 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.manufactory" style="width: 100%" 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="filterQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
+              <el-input v-model="filterQuery.basicPrductRemak1" style="width: 100%"
+                        :placeholder="productRemarkSet.remarkTitle1"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
+            <el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
+              <el-input v-model="filterQuery.basicPrductRemak2" style="width: 100%"
+                        :placeholder="productRemarkSet.remarkTitle2"
+                        clearable="true"></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -38,21 +65,22 @@
       <el-divider style="margin: 15px"></el-divider>
 
 
-      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border ref="multipleTable">
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border
+                ref="multipleTable">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="DI/物资编码" prop="nameCode"></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="batchNo"></el-table-column>
-        <el-table-column label="生产日期" prop="productionDate"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="入库数量" prop="inCount"></el-table-column>
-        <el-table-column label="出库数量" prop="outCount"></el-table-column>
-        <el-table-column label="结余数量" prop="reCount"></el-table-column>
-        <el-table-column label="生产企业" prop="manufactory" width="200"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="200"></el-table-column>
-        <el-table-column label="供应商" prop="supName" width="260"></el-table-column>
+        <el-table-column label="序号" type="index" width="55"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
+        <el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
+        <el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>
+        <el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
+        <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
+        <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="180"></el-table-column>
       </el-table>
     </el-card>
 
@@ -74,6 +102,7 @@ import {addDetail} from "@/api/inout/receiveOrder";
 import {addBizProduct} from "@/api/inout/orderDetailCode";
 import {getInvPreInProduct, getInvPreInProductStock} from "@/api/inventory/invPreInSearch";
 import {getInvPreProduct, getInvPreProductStock} from "@/api/inventory/invPreProduct";
+import {finProductSet} from "@/api/param/systemParamConfig";
 
 
 export default {
@@ -130,6 +159,7 @@ export default {
       idQuery: null,
       showSup: false,
       fromOptions: [],
+      productRemarkSet: {},
     };
   },
   components: {},
@@ -173,7 +203,7 @@ export default {
     getList() {
       this.loading = true;
       //寄售
-      if(this.invQueryData.advanceType==3){
+      if (this.invQueryData.advanceType == 3) {
         getInvPreProductStock(this.filterQuery)
           .then((response) => {
             this.showSup = response.data.showSup;
@@ -186,8 +216,8 @@ export default {
             this.list = [];
             this.total = 0;
           });
-      //预验收
-      }else if(this.invQueryData.advanceType==2){
+        //预验收
+      } else if (this.invQueryData.advanceType == 2) {
         getInvPreInProductStock(this.filterQuery)
           .then((response) => {
             this.showSup = response.data.showSup;
@@ -201,7 +231,7 @@ export default {
             this.total = 0;
           });
 
-      }else{
+      } else {
         getInvProductStock(this.filterQuery)
           .then((response) => {
             this.showSup = response.data.showSup;
@@ -226,16 +256,16 @@ export default {
         return;
       }
       var idster = [];
-      if(this.codeArray != null || this.codeArray!=undefined ){
-        if(this.codeArray.length>0){
-          for(var i=0;i<this.codeArray.length;i++){
+      if (this.codeArray != null || this.codeArray != undefined) {
+        if (this.codeArray.length > 0) {
+          for (var i = 0; i < this.codeArray.length; i++) {
             idster.push(this.codeArray[i].relIdFk);
           }
         }
-        if(idster.length>0){
-          for(var i=0;i<idster.length;i++){
-            for(var j=0;j<selection.length;j++){
-              if(idster[i]==selection[j].relIdFk){
+        if (idster.length > 0) {
+          for (var i = 0; i < idster.length; i++) {
+            for (var j = 0; j < selection.length; j++) {
+              if (idster[i] == selection[j].relIdFk) {
                 this.$message.error("该产品已录入！");
                 return
               }
@@ -293,8 +323,14 @@ export default {
           this.loading = false;
         });
       }
+    },
 
-
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data;
+        }
+      });
     },
   },
   filters: {
@@ -313,6 +349,7 @@ export default {
     };
   },
   created() {
+    this.findBasicProductSet();
     this.filterQuery.invCode = this.invQueryData.targetInvCode;
     // 加载表格数据
     this.getList();
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 3b3fec3f..1650efa6 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -6,48 +6,48 @@
                  v-show="showSearch"
                  label-width="100px">
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item class="query-form-item" label="单据号:">
                 <el-input
                   v-model="listQuery.billNo"
-                  placeholder="单据号"
+                  placeholder="单据号" style="width: 100%"
                   clearable
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="8">
               <el-form-item class="query-form-item" label="往来单位:">
                 <el-input
                   v-model="listQuery.corpName"
-                  placeholder="往来单位"
+                  placeholder="往来单位" style="width: 100%"
                   clearable
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item class="query-form-item" label="领用类型">
-                <el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">
-                  <el-option
-                    v-for="item in originTypes"
-                    :key="item.originAction"
-                    :label="item.originName"
-                    :value="item.originAction">
-                    <span style="float: left;font-size: 13px">{{ item.originAction }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
-                        item.originName
-                      }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
+            <!--            <el-col :span="6">-->
+            <!--              <el-form-item class="query-form-item" label="领用类型">-->
+            <!--                <el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">-->
+            <!--                  <el-option-->
+            <!--                    v-for="item in originTypes"-->
+            <!--                    :key="item.originAction"-->
+            <!--                    :label="item.originName"-->
+            <!--                    :value="item.originAction">-->
+            <!--                    <span style="float: left;font-size: 13px">{{ item.originAction }}</span>-->
+            <!--                    <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
+            <!--                        item.originName-->
+            <!--                      }}</span>-->
+            <!--                  </el-option>-->
+            <!--                </el-select>-->
+            <!--              </el-form-item>-->
+            <!--            </el-col>-->
+            <!--          </el-row>-->
+            <el-col :span="8">
               <el-form-item class="query-form-item" label="单据日期:">
                 <el-date-picker
                   :picker-options="pickerOptions"
                   v-model="actDateRange"
                   type="daterange"
+                  style="width: 100%"
                   format="yyyy 年 MM 月 dd 日"
                   value-format="yyyy-MM-dd"
                   range-separator="至"
@@ -86,8 +86,7 @@
           @current-change="handleDetail"
         >
           <el-table-column label="序号" type="index" width="60"></el-table-column>
-          <el-table-column label="领用类型" prop="billTypeName"></el-table-column>
-          <el-table-column label="单据号" prop="billNo"></el-table-column>
+          <el-table-column label="领用单号" prop="billNo"></el-table-column>
           <el-table-column label="领用仓库" prop="invName"></el-table-column>
           <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="单据日期" prop="createTime"></el-table-column>
@@ -112,13 +111,13 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%">
         <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="物资编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="单据数量" prop="count"></el-table-column>
+        <el-table-column label="领用数量" prop="count"></el-table-column>
       </el-table>
     </el-card>
 
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index e8eb5571..295c676e 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -175,7 +175,7 @@
             >删除
             </el-button
             >
-<!--            <el-button-->
+            <!--            <el-button-->
             <!--              type="text"-->
             <!--              size="small"-->
             <!--              v-if="scope.row.status == 1"-->
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index 497e0726..b1f07c85 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -4,16 +4,16 @@
       <el-row type="flex" justify="end">
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
           <el-button
-              type="primary"
-              @click.native="saveOrder('1')"
-              :loading="loading"
+            type="primary"
+            @click.native="saveOrder('1')"
+            :loading="loading"
           >草稿保存
           </el-button
           >
           <el-button
-              type="primary"
-              @click.native="saveOrder('2')"
-              :loading="loading"
+            type="primary"
+            @click.native="saveOrder('2')"
+            :loading="loading"
           >提交单据
           </el-button
           >
@@ -29,13 +29,13 @@
           <el-col :span="11">
             <el-form-item prop="createTime" label="创建时间:">
               <el-date-picker
-                  :disabled="true"
-                  v-model="formData.createTime"
-                  type="datetime"
-                  placeholder="选择日期"
-                  style="width: 100%"
-                  :clearable="false"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                :disabled="true"
+                v-model="formData.createTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 100%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
@@ -50,10 +50,10 @@
                          :disabled="codeArray.length>0"
                          clearable>
                 <el-option
-                    v-for="item in invList"
-                    :key="item.name"
-                    :label="item.name"
-                    :value="item.code">
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -62,14 +62,13 @@
             <el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
               <el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
                          clearable="true"
-                         :disabled="true"
                          style="width: 100%"
               >
                 <el-option
-                    v-for="item in fromOptions"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.code">
+                  v-for="item in fromOptions"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -107,10 +106,10 @@
       <el-card>
         <el-button-group style="display: flex">
           <el-button
-              type="primary"
-              @click.native.stop="selectProductFunction()"
-              style="margin: 0px 60px 10px auto; height: 35px"
-              :loading="loading"
+            type="primary"
+            @click.native.stop="selectProductFunction()"
+            style="margin: 0px 60px 10px auto; height: 35px"
+            :loading="loading"
           >产品录入
           </el-button
           >
@@ -140,10 +139,12 @@
           <el-table-column label="供应商" prop="supName"></el-table-column>
           <el-table-column label="操作" width="150">
             <template slot-scope="scope">
-              <el-button type="text" size="small" :disabled="!ischeck" @click.stop="true"
+              <el-button type="text" size="small" :disabled="!ischeck || scope.row.index != selectedIndex"
+                         @click.stop="true"
                          @click.native="save(scope.row)">保存
               </el-button>
-              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
+              <el-button type="text" size="small" :disabled="scope.row.index == selectedIndex  ||  ischeck"
+                         @click.stop="true"
                          @click.native="rowChange(scope.row)">编辑
               </el-button>
               <el-button type="text" size="small" @click.stop="true"
@@ -157,19 +158,19 @@
 
 
     <el-dialog
-        title="库存设备录入"
-        :visible.sync="selectInvProductVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="85%"
-        v-if="selectInvProductVisible"
-        :append-to-body='true'
+      title="库存物资录入"
+      :visible.sync="selectInvProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="selectInvProductVisible"
+      :append-to-body='true'
     >
       <dialogInvProduct
-          :closeDialog="closeDialogC2"
-          :invQueryData="formData"
-          :codeArray="codeArray"
-          :type="1"
+        :closeDialog="closeDialogC2"
+        :invQueryData="formData"
+        :codeArray="codeArray"
+        :type="1"
       ></dialogInvProduct>
     </el-dialog>
   </div>
@@ -178,7 +179,7 @@
 <script>
 import {getBusChange} from "@/api/basic/busTypeChange";
 import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
-import {filterSubByInv, findByFrom, findByUp, findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubByInv, findByFrom, findByUp, findInvByUser, findLyInv} from "@/api/system/invSubWarehouse";
 import dialogInvProduct from "../DialogSelectInvProduct";
 import {getOrderDetail} from "@/api/inout/receiveOrder";
 import {parseTime} from "@/utils/coTools";
@@ -209,8 +210,8 @@ export default {
       code: "",
       query: {
         orderIdFk: "",
-        page: 1,
-        limit: 10,
+        // page: 1,
+        // limit: 10,
       },
       formData: {
         invCode: null,
@@ -258,13 +259,13 @@ export default {
       sLoading: false,
       busTypes: [],
       currentRow: {},
-      selectedIndex: "",
+      selectedIndex: null,
       selectInvProductVisible: false,
       thisData: {},
       storageList: [],
       invQueryData: {},
       type: 1,
-      Receive: {},
+      Receive: null,
       ischeck: false,
     };
   },
@@ -279,26 +280,26 @@ export default {
         filter: 3
       };
       findInvByUser(query)
-          .then((response) => {
-            this.invList = response.data || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {
+        });
     },
     //往来分库
     findFromInv() {
       let cQuery = {
         locInvCode: this.formData.invCode,
       };
-      findByUp(cQuery)
-          .then((response) => {
-            this.fromOptions = response.data || [];
-            if (this.fromOptions != null && this.fromOptions.length > 0) {
-              this.formData.targetInvCode = this.fromOptions[0].code;
-            }
-          })
-          .catch(() => {
-          });
+      findLyInv(cQuery)
+        .then((response) => {
+          this.fromOptions = response.data || [];
+          if (this.fromOptions != null && this.fromOptions.length > 0) {
+            this.formData.targetInvCode = this.fromOptions[0].code;
+          }
+        })
+        .catch(() => {
+        });
     },
     //领用类型
     getBusType() {
@@ -307,11 +308,11 @@ export default {
         type: 1,
       };
       getBusChange(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-          })
-          .catch(() => {
-          });
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {
+        });
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
@@ -389,17 +390,17 @@ export default {
       tQuery.subErpOrders = this.codeArray;
       tQuery.thirdPartyDate = 2;
       updateReceive(tQuery)
-          .then(response => {
-            if (response.code === 20000) {
-              this.$message.success(tMessage + "成功");
-              this.closeDialog(true);
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          })
+        .then(response => {
+          if (response.code === 20000) {
+            this.$message.success(tMessage + "成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
     },
     selectProductFunction(event) {
 
@@ -420,8 +421,6 @@ export default {
     },
     save() {
       if (this.$isNotBlank(this.Receive)) {
-        console.log("this.Receive:")
-        console.log(this.Receive)
         this.Receive.targetInvCode = this.formData.targetInvCode
         this.Receive.advanceType = this.formData.advanceType
         updateReceiveDetail(this.Receive).then(res => {
@@ -429,6 +428,7 @@ export default {
             this.loading = false;
             this.ischeck = false;
             this.selectedIndex = null;
+            this.getOrderDetailList()
             this.$message.success('修改成功');
           } else {
             this.$message.error(res.message);
@@ -438,14 +438,18 @@ export default {
       }
     },
     rowChange(val) {
+
+      // if(this.Receive!=null){
+      //   this.save()
+      // }
       this.Receive = val;
-      console.log("var:")
-      console.log(this.Receive)
       this.ischeck = true;
       this.currentRow = val;
       this.selectedIndex = val.index;
       this.iCount = val.count;
-      this.focusNext('iCount');
+      // this.focusNext('iCount');
+
+      this.getOrderDetailList()
     },
     tableCountChange(row) {
       this.Receive = row;
@@ -477,17 +481,17 @@ export default {
           _this.detailLoading = true;
           if (_this.$isNotBlank(row.id)) {
             delReceiveDetail({id: row.id})
-                .then(response => {
-                  _this.detailLoading = false;
-                  if (response.code === 20000) {
-                    _this.getOrderDetailList();
-                  } else {
-                    _this.$message.error(response.message);
-                  }
-                })
-                .catch(() => {
-                  _this.detailLoading = false;
-                })
+              .then(response => {
+                _this.detailLoading = false;
+                if (response.code === 20000) {
+                  _this.getOrderDetailList();
+                } else {
+                  _this.$message.error(response.message);
+                }
+              })
+              .catch(() => {
+                _this.detailLoading = false;
+              })
           } else {
             _this.$message.success('删除成功');
             _this.codeArray.splice(index, 1);
@@ -510,16 +514,16 @@ export default {
       this.loading = true;
       this.query.orderIdFk = this.formData.billNo;
       getOrderDetail(this.query) //查找该单号下的所有条码
-          .then((response) => {
-            this.codeArray = response.data.list || [];
-            this.total = response.data.total || 0;
-            this.loading = false;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
     },
   },
   filters: {},
@@ -547,8 +551,8 @@ export default {
         billType: "HCLY",
         billNo: null,
         createTime: parseTime(
-            date,
-            "{y}-{m}-{d} {h}:{i}:{s}"
+          date,
+          "{y}-{m}-{d} {h}:{i}:{s}"
         ),
       };
       this.orderEditor = false;
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 4441da87..3b5f8d88 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -160,7 +160,7 @@
 
 import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
-import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSub, filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -381,8 +381,9 @@ export default {
       let query = {
         filter: 3,
         name: keyWord,
+        locInvCode: this.$store.getters.locInvCode
       };
-      findInvByUser(query)
+      findByFrom(query)
         .then((response) => {
           this.invList = response.data || [];
           // if (this.invList.length > 0) {
@@ -402,6 +403,7 @@ export default {
   },
   created() {
     this.finCurInv();
+    this.getList();
 
   },
 };
diff --git a/src/views/inout/receive/receiveMySearch.vue b/src/views/inout/receive/receiveMySearch.vue
index 2106f395..3c97c6cc 100644
--- a/src/views/inout/receive/receiveMySearch.vue
+++ b/src/views/inout/receive/receiveMySearch.vue
@@ -468,6 +468,7 @@ export default {
   },
   created() {
     this.finCurInv();
+    this.getList();
   },
 };
 </script>
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 114c0040..a3fe5800 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -10,7 +10,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="领用仓库:">
-              <el-select v-model="filterQuery.targetInvCode"
+              <el-select v-model="filterQuery.invCode"
                          filterable
                          clearable
                          remote
@@ -179,7 +179,7 @@
 import {getOrderDetail, getReceiveOrder, printOrder} from "@/api/inout/receiveOrder";
 import auditDetail from "@/views/inout/receive/receiveAuditDetail"
 import {delReceive} from "@/api/thrsys/thrOrderReceive";
-import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSub, filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -426,9 +426,10 @@ export default {
       this.invList = [];
       let query = {
         name: keyWord,
+        locInvCode: this.$store.getters.locInvCode,
         filter: 3
       };
-      findInvByUser(query)
+      findByFrom(query)
         .then((response) => {
           this.invList = response.data || [];
           // if (this.invList.length > 0) {
@@ -470,6 +471,7 @@ export default {
   },
   created() {
     this.finCurInv();
+    this.getList();
   },
 };
 </script>
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index f0771822..e766246c 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -152,7 +152,8 @@ export default {
         deptCode: null,
         invCode: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        price: null,
       },
       list: [],
       total: 0,
@@ -167,8 +168,14 @@ export default {
       });
       this.invPreProductDetailQuery = {
         code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        price: null,
       };
       this.getList();
     },
@@ -206,7 +213,7 @@ export default {
       this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
       this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
-      this.invProductDetailQuery.price = this.inputQuery.price;
+      this.invPreProductDetailQuery.price = this.inputQuery.price;
 
       // this.invPreProductDetailQuery.nameCode = this.inputQuery.nameCode;
       getInvPreInProductDetail(this.invPreProductDetailQuery).then((res) => {
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 7e7d199e..ed73aba7 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -153,6 +153,7 @@ export default {
         invCode: null,
         page: 1,
         limit: 10,
+        price:null,
         defaultSort: {prop: 'orderTime', order: 'desc'},
       },
       list: [],
@@ -167,8 +168,15 @@ export default {
       });
       this.invPreProductDetailQuery = {
         code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        price:null,
+        defaultSort: {prop: 'orderTime', order: 'desc'},
       };
       this.getList();
     },
@@ -205,7 +213,7 @@ export default {
       this.invPreProductDetailQuery.batchNo = this.inputQuery.batchNo;
       this.invPreProductDetailQuery.deptCode = this.inputQuery.deptCode;
       this.invPreProductDetailQuery.invCode = this.inputQuery.invCode;
-      this.invProductDetailQuery.price = this.inputQuery.price;
+      this.invPreProductDetailQuery.price = this.inputQuery.price;
       // 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 3b188e26..5a089fc8 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -149,6 +149,7 @@ export default {
         batchNo: null,
         deptCode: null,
         invCode: null,
+        price:null,
         page: 1,
         limit: 10
       },
@@ -165,6 +166,12 @@ export default {
       });
       this.invProductDetailQuery = {
         code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
+        price:null,
         page: 1,
         limit: 10
       };
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index f7089912..55f447ed 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -38,14 +38,14 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="物品编码:" class="query-form-item">
+            <el-form-item label="DI/物资编码:" class="query-form-item">
               <el-input v-model="listQuery.unionCode" style="width: 100%" 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: 100%" placeholder="请输入产品通用名"
+            <el-form-item label="物资名称:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue
index 4d082a71..c5076ed1 100644
--- a/src/views/system/dept/authDept.vue
+++ b/src/views/system/dept/authDept.vue
@@ -80,7 +80,7 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark"> </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
@@ -250,7 +250,7 @@
             prop="employeeName"
           ></el-table-column>
           <el-table-column label="用户账号" prop="userName"></el-table-column>
-          <el-table-column label="备注" prop="comments"> </el-table-column>
+          <el-table-column label="备注" prop="comments"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
@@ -322,7 +322,7 @@
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="仓库名称" prop="name"></el-table-column>
           <el-table-column label="仓库编码" prop="code"></el-table-column>
-          <el-table-column label="备注" prop="remark"> </el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
           <!--          <el-table-column label="操作">-->
           <!--            <template slot-scope="scope">-->
           <!--              <el-button-->
@@ -354,11 +354,11 @@ import {
   saveWarehouse,
 } from "@/api/system/invWarehouse";
 
-import { treeList, treeSelectedList } from "@/api/system/dataStatus";
+import {treeList, treeSelectedList} from "@/api/system/dataStatus";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { listDeptUser, removeUser } from "@/api/system/deptUser";
-import { filterSubAll } from "@/api/system/invSubWarehouse";
+import {listDeptUser, removeUser} from "@/api/system/deptUser";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -388,9 +388,9 @@ export default {
       deptOptions: [],
       rules: {
         name: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" },
+          {required: true, message: "部门名称不能为空", trigger: "blur"},
         ],
-        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+        status: [{required: true, message: "状态不能为空", trigger: "blur"}],
       },
       menuExpand: false,
       menuNodeAll: false,
@@ -624,7 +624,8 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     toggleExpandAll() {
       this.refreshTable = false;
@@ -662,7 +663,7 @@ export default {
       });
     },
     getDeptStatusMenuTreeselect(deptId) {
-      let query = { deptId: deptId };
+      let query = {deptId: deptId};
       return treeSelectedList(query).then((response) => {
         this.menuOptions = response.data.menus;
         return response;
@@ -741,7 +742,8 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     //仓库相关
@@ -762,7 +764,7 @@ export default {
       this.getInvList();
     },
   },
-  components: { Treeselect },
+  components: {Treeselect},
   mounted() {
   },
   created() {
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index fd5d6c01..4a201c0e 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -140,7 +140,7 @@
         top="5vh"
       >
         <el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
-          <el-row :gutter="20" class="el-row" type="flex">
+          <el-row :gutter="20" class="el-row">
             <el-col :span="12" class="el-col">
               <el-form-item label="所属部门" prop="parentId">
                 <el-select v-model="subData.parentId" placeholder="顶级" style="width: 80%">
@@ -168,8 +168,6 @@
                 </treeselect>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
               <el-form-item label="仓库编码" prop="code" class="query-form-item">
                 <el-input
@@ -188,8 +186,6 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="12" class="el-col">
               <el-form-item label="仓库类型" prop="advanceType">
                 <el-select v-model="subData.advanceType" :disabled="invWouse != null" placeholder="请选择仓库类型"
@@ -207,7 +203,6 @@
               <!--  </el-radio-group>-->
               <!--</el-form-item>-->
             </el-col>
-
             <el-col :span="12" class="el-col">
               <el-form-item label="是否能被供应商使用" prop="spUse" class="query-form-item">
                 <el-radio-group v-model="subData.spUse">
@@ -216,11 +211,15 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-          </el-row>
-
-
-          <el-row class="el-row" type="flex">
-            <el-col class="el-col">
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否领用仓库" prop="lyInvType" class="query-form-item">
+                <el-radio-group v-model="subData.lyInvType">
+                  <el-radio :label="true">是</el-radio>
+                  <el-radio :label="false">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col class="el-col" :span="24">
               <el-form-item label="备注" prop="remark" class="query-form-item">
                 <el-input
                   v-model="subData.remark"
@@ -267,13 +266,15 @@
           </el-table>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click.native="hideForm">取消</el-button>
           <el-button
             type="primary"
             @click.native="forInvSubmit()"
           >提交
           </el-button
           >
+
+          <el-button @click.native="hideForm">取消</el-button>
+
         </div>
       </el-dialog>
       <!-- 仓库关联第三方分库对话框-->
@@ -453,7 +454,7 @@ export default {
         ]
       },
       subData: {},
-      subDataType:{},
+      subDataType: {},
       fromDeptOptions: [],
       invOptions: [],
       thirdSubQuery: {
@@ -492,7 +493,7 @@ export default {
         name: "",
         status: "",
       };
-      this.subDataType.advanceType=null;
+      this.subDataType.advanceType = null;
       this.getList();
 
       //置空用户列表和货位信息列表的参数
@@ -504,13 +505,13 @@ export default {
         invName: null
       };
     },
-    onResetintent(){
+    onResetintent() {
       this.$router.push({
         path: "",
       });
       this.thirdSubQuery = {
         thirdSysFk: this.thirdSubQuery.thirdSysFk,
-        page:1,
+        page: 1,
         limit: 10
       }
 
@@ -531,7 +532,7 @@ export default {
     },
 
     onSubmit() { //提交查询
-      this.query.advanceType=this.subDataType.advanceType;
+      this.query.advanceType = this.subDataType.advanceType;
       this.getList();
     },
 
@@ -609,7 +610,7 @@ export default {
     },
 
     hideForm() {    // 新增，编辑---取消
-      this.query.advanceType=null;
+      this.query.advanceType = null;
       this.formVisible = false;
       this.subFormVisible = false;
       this.resetForm();
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 9585c8df..048f751b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -23,9 +23,9 @@
         <el-button-group>
           <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-                     v-hasPermi="['system:menu:query']">查询
+          >查询
           </el-button>
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']"
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
           >新增
           </el-button>
           <el-button type="primary" icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
@@ -79,28 +79,25 @@
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
+      <el-table-column label="创建时间" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" fixed="right" width="140">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:menu:edit']"
           >编辑
           </el-button>
           <el-button
             type="text"
-            v-hasPermi="['system:menu:add']"
             @click="handleAdd(scope.row)"
           >新增
           </el-button>
           <el-button
             type="text"
-            v-hasPermi="['system:menu:delete']"
             @click="handleDelete(scope.row)"
           >删除
           </el-button>