From 84905777f7e49c9da69ea3c5e3dc7c9cbf189a5b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 29 Oct 2023 10:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=EF=BC=8C=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A5=E6=9C=88=E5=AD=A3=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   4 +-
 src/api/system/invSubWarehouse.js             |  10 +
 .../basic/busType/bussinessTypeModify.vue     |   6 +-
 src/views/inout/InvoiceRegByFp.vue            | 306 +++++++++---------
 src/views/inout/InvoiceRegByOrder.vue         |  11 +-
 src/views/inout/receive/DialogNewReceive.vue  | 230 ++++++-------
 src/views/inout/stat/IoStatDaySearch.vue      |  23 +-
 src/views/inout/stat/IoStatMonthSearch.vue    |  11 +-
 src/views/inout/stat/IoStatQuarterSearch.vue  |  11 +-
 src/views/inout/stat/IoStatYearSearch.vue     |  11 +-
 10 files changed, 319 insertions(+), 304 deletions(-)

diff --git a/.env.production b/.env.production
index de1ab952..118755df 100644
--- a/.env.production
+++ b/.env.production
@@ -9,7 +9,7 @@ ENV = 'production'
 
 #林纪裕cd
 # 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://www.linjiyu.lol:83/UDI_WMS_MC/'
 
 # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
@@ -30,7 +30,7 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 # 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 094f492e..cbaf51d3 100644
--- a/src/api/system/invSubWarehouse.js
+++ b/src/api/system/invSubWarehouse.js
@@ -39,6 +39,16 @@ export function findByFrom(query) {
 }
 
 
+//获取上级仓库
+export function findByUp(query) {
+  return axios({
+    url: "/spms/inv/warehouse/findByUp",
+    method: "get",
+    params: query
+  });
+}
+
+
 export function filterSubByInv(query) {
   return axios({
     url: "/spms/inv/warehouse/findByUser",
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 396043fc..31b3f945 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -360,7 +360,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
-                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
+                         :disabled="  inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
                          @change="outChange"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
@@ -381,7 +381,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
-                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
+                         :disabled="  inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
                          @change="outChange"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
@@ -446,7 +446,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.preInBack"
-                         :disabled="inputQuery.scanPreIn ==false " @change="getPreInBack"
+                         :disabled="inputQuery.scanPreIn ==false || inputQuery.corpType ==2 " @change="getPreInBack"
                          style="width: 65%"
                          placeholder="是否退回"
               >
diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 623ecfa9..6fba782c 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item class="query-form-item" label="发票代码:">
-              <el-input v-model="invoiceQuery.invoiceEncode" placeholder="请输入发票代码" style="width: 90%"
+              <el-input v-model="invoiceQuery.invoiceCode" placeholder="请输入发票代码" style="width: 90%"
                         clearable="true"
               ></el-input>
             </el-form-item>
@@ -30,15 +30,15 @@
           <el-col :span="8">
             <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%"
+                :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>
@@ -49,9 +49,9 @@
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button
-              type="primary"
-              icon="el-icon-refresh"
-              @click="onReset"
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
           >重置
           </el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit"
@@ -72,57 +72,57 @@
       >
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-            label="发票代码" width="150"
-            prop="invoiceEncode"
+          label="发票代码" width="150"
+          prop="invoiceEncode"
         ></el-table-column>
         <el-table-column
-            label="机器编码" width="150"
-            prop="machineNo"
-            show-overflow-tooltip
+          label="机器编码" width="150"
+          prop="machineNo"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-            label="发票编码" width="150"
-            prop="invoiceCode"
+          label="发票编码" width="150"
+          prop="invoiceCode"
         ></el-table-column>
         <el-table-column
-            label="开票日期" width="150"
-            prop="invoiceDate"
+          label="开票日期" width="150"
+          prop="invoiceDate"
         ></el-table-column>
         <el-table-column
-            label="发票价格"
-            prop="price" width="100"
+          label="发票价格"
+          prop="price" width="100"
         ></el-table-column>
         <el-table-column
-            label="登记时间" width="190"
-            prop="createTime"
+          label="登记时间" width="190"
+          prop="createTime"
         ></el-table-column>
         <el-table-column
-            label="备注"
-            prop="remark" width="140"
-            show-overflow-tooltip
+          label="备注"
+          prop="remark" width="140"
+          show-overflow-tooltip
         ></el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template slot-scope="scope">
 
             <el-button
-                type="text"
-                size="small"
-                @click.native.stop="editInvoice(scope.row)"
+              type="text"
+              size="small"
+              @click.native.stop="editInvoice(scope.row)"
             >编辑
             </el-button
             >
             <el-button
-                type="text"
-                size="small"
-                @click.native.stop="deleteInvoice(scope.row)"
+              type="text"
+              size="small"
+              @click.native.stop="deleteInvoice(scope.row)"
             >删除
             </el-button
             >
             <el-button
-                type="text"
-                size="small"
-                :disabled="!scope.row.licenseUrl"
-                @click.native.stop="showImgViewer(scope.row)"
+              type="text"
+              size="small"
+              :disabled="!scope.row.licenseUrl"
+              @click.native.stop="showImgViewer(scope.row)"
             >预览
             </el-button
             >
@@ -131,26 +131,26 @@
         </el-table-column>
       </el-table>
       <pagination
-          v-show="invoicTotal>0"
-          :total="invoicTotal"
-          :page.sync="invoiceQuery.page"
-          :limit.sync="invoiceQuery.limit"
-          @pagination="getInvoiceList"
+        v-show="invoicTotal>0"
+        :total="invoicTotal"
+        :page.sync="invoiceQuery.page"
+        :limit.sync="invoiceQuery.limit"
+        @pagination="getInvoiceList"
       />
     </el-card>
 
     <el-dialog
-        title="发票编辑"
-        :visible.sync="Upinvoice"
-        :before-close="freshen"
-        width="60%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="Upinvoice"
+      title="发票编辑"
+      :visible.sync="Upinvoice"
+      :before-close="freshen"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="Upinvoice"
     >
       <Dialog-invoice
-          :closeDialog="closeAcceptDialog"
-          :inputQuery="curInvoice"
+        :closeDialog="closeAcceptDialog"
+        :inputQuery="curInvoice"
       ></Dialog-invoice>
     </el-dialog>
 
@@ -228,30 +228,30 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-              label="DI/物资编码" width="150"
-              prop="nameCode"
-              show-overflow-tooltip
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="物资名称"
-              prop="coName"
-              width="150"
-              show-overflow-tooltip
+            label="物资名称"
+            prop="coName"
+            width="150"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="规格型号"
-              width="150"
-              prop="spec"
+            label="规格型号"
+            width="150"
+            prop="spec"
           ></el-table-column>
           <el-table-column
-              label="批次号"
-              width="100"
-              prop="batchNo"
+            label="批次号"
+            width="100"
+            prop="batchNo"
           ></el-table-column>
           <el-table-column
-              label="数量"
-              prop="count"
-              width="100"
+            label="数量"
+            prop="count"
+            width="100"
           ></el-table-column>
           <el-table-column
             label="扫码数量"
@@ -259,43 +259,43 @@
             width="100"
           ></el-table-column>
           <el-table-column
-              label="价格"
-              prop="price"
-              width="100"
+            label="价格"
+            prop="price"
+            width="100"
           ></el-table-column>
           <el-table-column label="金额" prop="amout" width="100"></el-table-column>
           <el-table-column
-              label="生产日期"
-              prop="productDate"
-              width="100"
+            label="生产日期"
+            prop="productDate"
+            width="100"
           ></el-table-column>
           <el-table-column
-              label="失效日期"
-              prop="expireDate"
-              width="100"
+            label="失效日期"
+            prop="expireDate"
+            width="100"
           ></el-table-column>
           <el-table-column width="100" label="计量单位" prop="measname">
           </el-table-column>
           <el-table-column
-              label="生产企业"
-              prop="manufacturer"
-              width="160"
-              show-overflow-tooltip
+            label="生产企业"
+            prop="manufacturer"
+            width="160"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="注册/备案号"
-              width="160"
-              prop="certCode"
-              show-overflow-tooltip
+            label="注册/备案号"
+            width="160"
+            prop="certCode"
+            show-overflow-tooltip
           ></el-table-column>
 
         </el-table>
         <pagination
-            v-show="productTotal>0"
-            :total="productTotal"
-            :page.sync="productQuery.page"
-            :limit.sync="productQuery.limit"
-            @pagination="getProductDetailList"
+          v-show="productTotal>0"
+          :total="productTotal"
+          :page.sync="productQuery.page"
+          :limit.sync="productQuery.limit"
+          @pagination="getProductDetailList"
         />
 
       </el-tab-pane>
@@ -323,41 +323,41 @@
 
         </el-table>
         <pagination
-            v-show="codeTotal>0"
-            :total="codeTotal"
-            :page.sync="codeQuery.page"
-            :limit.sync="codeQuery.limit"
-            @pagination="getCodeDetailList"
+          v-show="codeTotal>0"
+          :total="codeTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getCodeDetailList"
         />
       </el-tab-pane>
     </el-tabs>
     <el-dialog
-        title="发票登记"
-        :visible.sync="checkInvoice"
-        width="60%"
-        :before-close="closeAcceptDialog"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="checkInvoice"
+      title="发票登记"
+      :visible.sync="checkInvoice"
+      width="60%"
+      :before-close="closeAcceptDialog"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="checkInvoice"
     >
       <invoiceRegCkeck
-          :curInvoice="curInvoice"
-          :closeDialog="closeAcceptDialog"
+        :curInvoice="curInvoice"
+        :closeDialog="closeAcceptDialog"
       ></invoiceRegCkeck>
     </el-dialog>
 
 
     <el-dialog
-        title="发票—确认登记"
-        :visible.sync="determineVisible"
-        width="80%"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="determineVisible"
+      title="发票—确认登记"
+      :visible.sync="determineVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="determineVisible"
     >
       <InvoiceRegistrationDetermine
-          :closeDialog="closeDetermineDialog"
-          :determineData="determineData"
+        :closeDialog="closeDetermineDialog"
+        :determineData="determineData"
       ></InvoiceRegistrationDetermine>
     </el-dialog>
 
@@ -451,7 +451,7 @@ export default {
 
       imgList: [],
       imgViewerVisible: false,
-      cowEn:null,
+      cowEn: null,
       //单据相关参数
       orderLoading: false,
       orderList: [],
@@ -600,30 +600,30 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       })
-          .then(() => {
-            this.par = row
-            this.par.regId = this.regId
-            deleteInvoice(row)
-                .then((response) => {
-                  if (response.code == 20000) {
-                    this.getInvoiceList()
-                    this.$message({
-                      type: 'success',
-                      message: '删除成功！'
-                    })
-                  }
-                })
-                .catch(() => {
+        .then(() => {
+          this.par = row
+          this.par.regId = this.regId
+          deleteInvoice(row)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.getInvoiceList()
+                this.$message({
+                  type: 'success',
+                  message: '删除成功！'
                 })
-          })
-          .catch(() => {
-          })
+              }
+            })
+            .catch(() => {
+            })
+        })
+        .catch(() => {
+        })
     },
 
     showImgViewer(row) {
       this.certFileUrl =
-          this.BASE_URL +
-          '/udiwms/image/register/file/getImage?type=image2&name=' + row.licenseUrl
+        this.BASE_URL +
+        '/udiwms/image/register/file/getImage?type=image2&name=' + row.licenseUrl
       this.imgList = []
       this.imgList.push(this.certFileUrl)
       let index = row.licenseUrl.lastIndexOf('.')
@@ -664,19 +664,19 @@ export default {
       this.currentRow = {billNo: ''}
       let query = {invoiceEncode: row.invoiceEncode}
       orderDetail(query)
-          .then((response) => {
-            this.orderLoading = false
-            if (response.code === 20000) {
-              this.orderList = response.data.list || []
-            } else {
-              this.$message.error(response.message)
-            }
-          })
-          .catch((error) => {
-            this.$message.error(error.message)
-            this.orderLoading = false
-            this.orderList = []
-          })
+        .then((response) => {
+          this.orderLoading = false
+          if (response.code === 20000) {
+            this.orderList = response.data.list || []
+          } else {
+            this.$message.error(response.message)
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.orderLoading = false
+          this.orderList = []
+        })
     },
     // 清空单据详情数据列表
     clearDetailList() {
@@ -688,7 +688,7 @@ export default {
       // this.resultDetailList = [];
     },
     handleInvoiceChange(val) {
-      this.cowEn=val;
+      this.cowEn = val;
       this.getOrderList(val)
       this.getProductDetailList(val)
     },
@@ -766,13 +766,13 @@ export default {
     },
     getUser() {
       getUserBean()
-          .then((res) => {
-            if (res.code == 20000) {
-              if (res.data.customerId == "110") {
-                this.showSup = true;
-              }
+        .then((res) => {
+          if (res.code == 20000) {
+            if (res.data.customerId == "110") {
+              this.showSup = true;
             }
-          })
+          }
+        })
     },
   },
   created() {
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 181ea3a5..4252df1f 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -348,10 +348,9 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="发票代码" width="150"
+            label="发票编码" width="150"
             prop="invoiceEncode"
           ></el-table-column>
-
           <el-table-column
             label="物资名称"
             prop="cpmctymc" width="150"
@@ -367,15 +366,15 @@
             prop="batchNo"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            label="发票代码" width="150"
+            prop="invoiceCode"
+          ></el-table-column>
           <el-table-column
             label="机器编码" width="150"
             prop="machineNo"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            label="发票编码" width="150"
-            prop="invoiceCode"
-          ></el-table-column>
           <el-table-column
             label="开票日期" width="150"
             prop="invoiceDate"
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index 0e4eccae..497e0726 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>
@@ -45,31 +45,31 @@
         <el-row :gutter="20">
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
-              <el-select v-model="formData.invCode"  @change="subStorageChange" placeholder="当前仓库信息"
+              <el-select v-model="formData.invCode" @change="subStorageChange" placeholder="当前仓库信息"
                          style="width: 100%;"
                          :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>
           </el-col>
           <el-col :span="11">
             <el-form-item class="query-form-item" prop="targetInvCode" label="领用仓库:">
-              <el-select v-model="formData.targetInvCode"  placeholder="请选择领用仓库" @change="getTargerType"
+              <el-select v-model="formData.targetInvCode" placeholder="请选择领用仓库" @change="getTargerType"
                          clearable="true"
-                         :disabled="codeArray.length>0"
+                         :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>
@@ -77,20 +77,20 @@
 
         </el-row>
         <el-row :gutter="20">
-<!--          <el-col :span="11">-->
-<!--            <el-form-item prop="billType" label="领用类型:">-->
-<!--              <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"-->
-<!--                         clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in busTypes"-->
-<!--                  :key="item.originAction"-->
-<!--                  :label="item.originName"-->
-<!--                  :value="item.originAction">-->
-<!--                  <span style="float: left">{{ item.originName }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="11">-->
+          <!--            <el-form-item prop="billType" label="领用类型:">-->
+          <!--              <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"-->
+          <!--                         clearable>-->
+          <!--                <el-option-->
+          <!--                  v-for="item in busTypes"-->
+          <!--                  :key="item.originAction"-->
+          <!--                  :label="item.originName"-->
+          <!--                  :value="item.originAction">-->
+          <!--                  <span style="float: left">{{ item.originName }}</span>-->
+          <!--                </el-option>-->
+          <!--              </el-select>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="11">
             <el-form-item prop="remark" label="备注:">
               <el-input v-model="formData.remark" auto-complete="off"></el-input>
@@ -107,10 +107,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
           >
@@ -157,19 +157,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 +178,7 @@
 <script>
 import {getBusChange} from "@/api/basic/busTypeChange";
 import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
-import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubByInv, findByFrom, findByUp, findInvByUser} from "@/api/system/invSubWarehouse";
 import dialogInvProduct from "../DialogSelectInvProduct";
 import {getOrderDetail} from "@/api/inout/receiveOrder";
 import {parseTime} from "@/utils/coTools";
@@ -265,7 +265,7 @@ export default {
       invQueryData: {},
       type: 1,
       Receive: {},
-      ischeck:false,
+      ischeck: false,
     };
   },
   components: {
@@ -279,24 +279,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,
-        type:1,
       };
-      findByFrom(cQuery)
-        .then((response) => {
-          this.fromOptions = response.data || [];
-        })
-        .catch(() => {
-        });
+      findByUp(cQuery)
+          .then((response) => {
+            this.fromOptions = response.data || [];
+            if (this.fromOptions != null && this.fromOptions.length > 0) {
+              this.formData.targetInvCode = this.fromOptions[0].code;
+            }
+          })
+          .catch(() => {
+          });
     },
     //领用类型
     getBusType() {
@@ -305,17 +307,17 @@ 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;
     },
-    getTargerType(){
-      this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
+    getTargerType() {
+      this.formData.advanceType = this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
       console.log(this.formData)
     },
     saveOrder(status) {
@@ -387,17 +389,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) {
 
@@ -416,7 +418,7 @@ export default {
       this.getOrderDetailList();
 
     },
-    save(){
+    save() {
       if (this.$isNotBlank(this.Receive)) {
         console.log("this.Receive:")
         console.log(this.Receive)
@@ -425,8 +427,8 @@ export default {
         updateReceiveDetail(this.Receive).then(res => {
           if (res.code == 20000) {
             this.loading = false;
-            this.ischeck=false;
-            this.selectedIndex=null;
+            this.ischeck = false;
+            this.selectedIndex = null;
             this.$message.success('修改成功');
           } else {
             this.$message.error(res.message);
@@ -436,7 +438,7 @@ export default {
       }
     },
     rowChange(val) {
-      this.Receive=val;
+      this.Receive = val;
       console.log("var:")
       console.log(this.Receive)
       this.ischeck = true;
@@ -446,7 +448,7 @@ export default {
       this.focusNext('iCount');
     },
     tableCountChange(row) {
-        this.Receive = row;
+      this.Receive = row;
     },
     tableRowClassName({row, rowIndex}) {
       row.index = rowIndex;
@@ -475,17 +477,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);
@@ -499,7 +501,7 @@ export default {
       });
     },
     subStorageChange(item) {
-      this.formData.targetInvCode='';
+      this.formData.targetInvCode = '';
       this.getBusType();
       this.findFromInv();
     },
@@ -508,16 +510,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: {},
@@ -545,8 +547,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/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue
index 0ce17935..d931e77c 100644
--- a/src/views/inout/stat/IoStatDaySearch.vue
+++ b/src/views/inout/stat/IoStatDaySearch.vue
@@ -33,10 +33,10 @@
             >查询
             </el-button
             >
-          <!--<el-button type="primary" icon="el-icon-search" @click="onSubmit"
-            >汇总
-            </el-button
-            >-->
+            <!--<el-button type="primary" icon="el-icon-search" @click="onSubmit"
+              >汇总
+              </el-button
+              >-->
           </el-button-group>
         </el-form-item>
       </el-form>
@@ -46,6 +46,7 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" type="invName"></el-table-column>
         <el-table-column label="记录号" prop="recordKey"></el-table-column>
         <el-table-column label="名称" prop="title"></el-table-column>
         <el-table-column label="汇总日期" prop="date"></el-table-column>
@@ -192,7 +193,7 @@ export default {
         page: 1,
         limit: 10
       },
-      key:null,
+      key: null,
       detailLoading: false,
       detailList: [],
       detailTotal: 0,
@@ -285,18 +286,18 @@ export default {
       this.detailTotal = 0;
     },
 
-    excel(){
-      if(isBlank(this.currentRow.recordKey)){
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
         return this.$message.error("请选择要导出的数据！");
       }
-      let params={billNo:this.currentRow.recordKey,key:"day"};
-      excelImport(params ).then( res =>{
-        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+      let params = {billNo: this.currentRow.recordKey, key: "day"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
         let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
         let a = document.createElement("a");
         a.href = url;
         a.click();
-          this.$message("成功")
+        this.$message("成功")
       })
 
     },
diff --git a/src/views/inout/stat/IoStatMonthSearch.vue b/src/views/inout/stat/IoStatMonthSearch.vue
index e5b265d8..57a013f9 100644
--- a/src/views/inout/stat/IoStatMonthSearch.vue
+++ b/src/views/inout/stat/IoStatMonthSearch.vue
@@ -42,6 +42,7 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" type="invName"></el-table-column>
         <el-table-column label="名称" prop="title"></el-table-column>
         <el-table-column label="记录号" prop="recordKey"></el-table-column>
         <el-table-column label="汇总日期" prop="date"></el-table-column>
@@ -263,13 +264,13 @@ export default {
       this.getList();
     },
 
-    excel(){
-      if(isBlank(this.currentRow.recordKey)){
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
         return this.$message.error("请选择要导出的数据！");
       }
-      let params={billNo:this.currentRow.recordKey,key:"month"};
-      excelImport(params ).then( res =>{
-        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+      let params = {billNo: this.currentRow.recordKey, key: "month"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
         let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
         let a = document.createElement("a");
         a.href = url;
diff --git a/src/views/inout/stat/IoStatQuarterSearch.vue b/src/views/inout/stat/IoStatQuarterSearch.vue
index ba0a241b..3600c21f 100644
--- a/src/views/inout/stat/IoStatQuarterSearch.vue
+++ b/src/views/inout/stat/IoStatQuarterSearch.vue
@@ -42,6 +42,7 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" type="invName"></el-table-column>
         <el-table-column label="名称" prop="title"></el-table-column>
         <el-table-column label="记录号" prop="recordKey"></el-table-column>
         <el-table-column label="汇总日期" prop="date"></el-table-column>
@@ -283,13 +284,13 @@ export default {
       this.detailList = [];
       this.detailTotal = 0;
     },
-    excel(){
-      if(isBlank(this.currentRow.recordKey)){
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
         return this.$message.error("请选择要导出的数据！");
       }
-      let params={billNo:this.currentRow.recordKey,key:"quarter"};
-      excelImport(params ).then( res =>{
-        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+      let params = {billNo: this.currentRow.recordKey, key: "quarter"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
         let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
         let a = document.createElement("a");
         a.href = url;
diff --git a/src/views/inout/stat/IoStatYearSearch.vue b/src/views/inout/stat/IoStatYearSearch.vue
index d97155e6..c18f869e 100644
--- a/src/views/inout/stat/IoStatYearSearch.vue
+++ b/src/views/inout/stat/IoStatYearSearch.vue
@@ -42,6 +42,7 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="仓库" type="invName"></el-table-column>
         <el-table-column label="名称" prop="title"></el-table-column>
         <el-table-column label="记录号" prop="recordKey"></el-table-column>
         <el-table-column label="汇总日期" prop="date"></el-table-column>
@@ -258,13 +259,13 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
-    excel(){
-      if(isBlank(this.currentRow.recordKey)){
+    excel() {
+      if (isBlank(this.currentRow.recordKey)) {
         return this.$message.error("请选择要导出的数据！");
       }
-      let params={billNo:this.currentRow.recordKey,key:"year"};
-      excelImport(params ).then( res =>{
-        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+      let params = {billNo: this.currentRow.recordKey, key: "year"};
+      excelImport(params).then(res => {
+        let blob = new Blob([res], {type: "application/vnd.ms-excel"});
         let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
         let a = document.createElement("a");
         a.href = url;