From 84751e92e9d846fcde013332d8bd353951196a0b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 23 Nov 2023 10:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B1=87=E6=80=BB=E7=BB=9F=E8=AE=A1=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/inout/statData.js                     | 16 +++---
 .../basic/busType/busTypeAdvancedSettings.vue | 51 ++++++++++++-------
 src/views/basic/busType/bussinessType.vue     |  9 ++--
 .../basic/busType/bussinessTypeModify.vue     | 21 +++++++-
 src/views/inout/DialogCreateOrder.vue         |  2 +-
 src/views/inout/DialogCreateOrderSelect.vue   | 46 ++++++++++-------
 src/views/inout/stat/IoStatDaySearch.vue      |  2 +-
 src/views/inout/stat/IoStatMonthSearch.vue    |  2 +-
 src/views/inout/stat/IoStatQuarterSearch.vue  |  2 +-
 src/views/inout/stat/IoStatYearSearch.vue     |  2 +-
 11 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/.env.production b/.env.production
index 3f823e62..c53df206 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/'
 
 
 刘恩典
diff --git a/src/api/inout/statData.js b/src/api/inout/statData.js
index 5506cfa0..45788d0a 100644
--- a/src/api/inout/statData.js
+++ b/src/api/inout/statData.js
@@ -40,12 +40,12 @@ export function filterYearList(params) {
   });
 }
 
-  export function excelImport(params) {
-    return axios({
-      url: "/udiwms/inv/excelExportOut",
-      method: "get",
-      responseType: 'blob',
-      params: params
-    });
-  }
+export function excelImport(params) {
+  return axios({
+    url: "/udiwms/inv/excelExportOut",
+    method: "get",
+    responseType: 'blob',
+    params: params
+  });
+}
 
diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue
index 26493892..c85e7bfb 100644
--- a/src/views/basic/busType/busTypeAdvancedSettings.vue
+++ b/src/views/basic/busType/busTypeAdvancedSettings.vue
@@ -156,23 +156,23 @@
       <!--      </el-row>-->
       <!--      <el-divider direction="horizontal"></el-divider>-->
 
-<!--      <el-row>-->
-<!--        <el-col span="5">-->
-<!--          <span class="sptext">允许供应商使用</span>-->
-<!--        </el-col>-->
-<!--        <el-divider direction="vertical"></el-divider>-->
-<!--        <el-col span="5">-->
-<!--          <el-select v-model="inputQuery.spUse" style="width: 65%" placeholder="是否允许" clearable>-->
-<!--            <el-option label="允许" :value="true"></el-option>-->
-<!--            <el-option label="不允许" :value="false"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-col>-->
-<!--        <el-divider direction="vertical"></el-divider>-->
-<!--        <el-col span="13">-->
-<!--          <span class="sptext">是否允许供应商使用此单据类型</span>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <el-divider></el-divider>-->
+      <!--      <el-row>-->
+      <!--        <el-col span="5">-->
+      <!--          <span class="sptext">允许供应商使用</span>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="5">-->
+      <!--          <el-select v-model="inputQuery.spUse" style="width: 65%" placeholder="是否允许" clearable>-->
+      <!--            <el-option label="允许" :value="true"></el-option>-->
+      <!--            <el-option label="不允许" :value="false"></el-option>-->
+      <!--          </el-select>-->
+      <!--        </el-col>-->
+      <!--        <el-divider direction="vertical"></el-divider>-->
+      <!--        <el-col span="13">-->
+      <!--          <span class="sptext">是否允许供应商使用此单据类型</span>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <!--      <el-divider></el-divider>-->
 
       <el-row>
         <el-col span="5">
@@ -311,6 +311,23 @@
         </el-col>
       </el-row>
       <el-divider></el-divider>
+      <el-row>
+        <el-col span="5">
+          <span class="sptext">预验收是否带回</span>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="5">
+          <el-select v-model="inputQuery.inPreInBack" style="width: 65%;margin-top: 4px" placeholder="是否带回">
+            <el-option label="带回" :value=1></el-option>
+            <el-option label="不带回" :value=2></el-option>
+          </el-select>
+        </el-col>
+        <el-divider direction="vertical"></el-divider>
+        <el-col span="13">
+          <span class="sptext">预验收是否带回</span>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
       <div>
 
 
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index b56635bc..f9fff659 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -263,11 +263,11 @@ export default {
         checkVailDate: 0, //校验近效期
         checkExpire: true,   //校验过期
         checkCertExpire: false,//校验证书过期
-        editType:2,
+        editType: 2,
         checkReview: null,
         secCheckReview: null,
         thrCheckReview: null,
-
+        inPreInBack: 1,
       },
       enableMap: {
         true: '是',
@@ -551,9 +551,10 @@ export default {
         checkVailDate: 0, //校验近效期
         checkExpire: 2,   //校验过期
         checkCertExpire: 0, //校验证书过期
-        editType:2,
+        editType: 2,
         backPreinType: 1,
-        sortNum: 999
+        sortNum: 999,
+        inPreInBack: 1,
       }
       this.addDialogVisible = true
     },
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 31b3f945..0a4379bd 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -302,7 +302,7 @@
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
-              <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用">
+              <el-select v-model="inputQuery.vailGroupBuy" style="width: 65%;margin-top: 4px" placeholder="是否启用">
                 <el-option label="无需校验" :value=0></el-option>
                 <el-option label="只采集集采产品" :value=1></el-option>
                 <el-option label="只采集非集采产品" :value=2></el-option>
@@ -314,6 +314,25 @@
             </el-col>
           </el-row>
           <el-divider></el-divider>
+
+
+          <el-row v-if="inputQuery.actionType==2">
+            <el-col span="5">
+              <span class="sptext">预验收是否带回</span>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="5">
+              <el-select v-model="inputQuery.inPreInBack" style="width: 65%;margin-top: 4px" placeholder="是否带回">
+                <el-option label="带回" :value=1></el-option>
+                <el-option label="不带回" :value=2></el-option>
+              </el-select>
+            </el-col>
+            <el-divider direction="vertical"></el-divider>
+            <el-col span="13">
+              <span class="sptext">预验收是否带回</span>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
         </el-collapse-item>
 
         <el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index fd35566d..f5e6f89a 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -665,7 +665,7 @@ export default {
         corpType: 0,
         genUnit: false,
         checkWebNew: null,
-        mainAction:null,
+        mainAction: null,
       },
       fromOptions: [],
       isCodeAlive: true,
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 9316c700..6c668a49 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -3,14 +3,13 @@
     <el-card class="el-card">
       <el-form
         :model="filterQuery"
-        class="query-form"
         size="mini"
         label-width="100px"
         v-show="showSearch"
       >
         <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="预验收单号:">
+            <el-form-item label="预验收单号:">
               <el-input
                 v-model="filterQuery.billNo"
                 placeholder="请输入单号"
@@ -40,17 +39,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="过滤已选入">
-              <el-select v-model="filterQuery.filterSelected">
+            <el-form-item label="过滤已选入">
+              <el-select v-model="filterQuery.filterSelected" style="width: 90%">
                 <el-option :value="true" label="是"></el-option>
                 <el-option :value="false" label="否"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="创建时间:">
+            <el-form-item label="预验收带回">
+              <el-select v-model="filterQuery.inPreInBack" clearable style="width: 90%">
+                <el-option :value="1" label="带回"></el-option>
+                <el-option :value="2" label="不带回"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="创建时间:">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -66,7 +71,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item class="query-form-item" label="备注:">
+            <el-form-item label="备注:">
               <el-input
                 v-model="filterQuery.remark"
                 placeholder="请输入备注"
@@ -117,31 +122,34 @@
         <el-table-column
           type="selection"
           :selectable="checkSelection"
-          width="55"
+          width="45"
         ></el-table-column>
-        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="序号" type="index" width="55"></el-table-column>
 
         <el-table-column
           label="单据号"
           prop="billNo"
+          width="120"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
+          width="140"
           label="单据类型"
           prop="billTypeName"
         ></el-table-column>
-        <el-table-column label="往来单位" prop="fromName" width="220">
+        <el-table-column label="往来单位" prop="fromName" width="180">
         </el-table-column>
-        <el-table-column label="所属部门" prop="deptName" width="120">
+        <el-table-column label="所属部门" prop="deptName" width="90">
         </el-table-column>
-        <el-table-column label="所属仓库" prop="invName" width="120">
+        <el-table-column label="所属仓库" prop="invName" width="90">
         </el-table-column>
         <el-table-column
           label="来源订单号"
           prop="corpOrderId"
+          width="140"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column label="来源" prop="fromType">
+        <el-table-column label="来源" prop="fromType"   width="120">
           <template slot-scope="scope">
             <span>{{ fromTypeMap[scope.row.fromType] }}</span>
           </template>
@@ -155,7 +163,8 @@
         </el-table-column>
         <el-table-column
           label="创建时间"
-          prop="createTime"
+          prop="createTime"  width="140"
+
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -212,7 +221,7 @@
       <el-tab-pane>
         <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
         <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
-          <el-form-item class="query-form-item" label="物资名称:">
+          <el-form-item label="物资名称:">
             <el-input
               v-model="bizQuery.productName"
               placeholder="请输入物资名称"
@@ -349,6 +358,7 @@ export default {
         startTime: null,
         endTime: null,
         filterSelected: true,
+        inPreInBack: 1,
       },
       fromInvOptions: [],
       checkStatus: {
@@ -474,6 +484,7 @@ export default {
         startTime: null,
         endTime: null,
         filterSelected: true,
+        inPreInBack: 1,
       };
       this.actDateRange = null
       this.getList();
@@ -820,6 +831,3 @@ export default {
 };
 </script>
 
-<style type="text/scss" lang="scss">
-
-</style>
diff --git a/src/views/inout/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue
index d931e77c..01b05d97 100644
--- a/src/views/inout/stat/IoStatDaySearch.vue
+++ b/src/views/inout/stat/IoStatDaySearch.vue
@@ -46,7 +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="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>
diff --git a/src/views/inout/stat/IoStatMonthSearch.vue b/src/views/inout/stat/IoStatMonthSearch.vue
index 57a013f9..b52f526f 100644
--- a/src/views/inout/stat/IoStatMonthSearch.vue
+++ b/src/views/inout/stat/IoStatMonthSearch.vue
@@ -42,7 +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="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>
diff --git a/src/views/inout/stat/IoStatQuarterSearch.vue b/src/views/inout/stat/IoStatQuarterSearch.vue
index 3600c21f..4fb88bfb 100644
--- a/src/views/inout/stat/IoStatQuarterSearch.vue
+++ b/src/views/inout/stat/IoStatQuarterSearch.vue
@@ -42,7 +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="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>
diff --git a/src/views/inout/stat/IoStatYearSearch.vue b/src/views/inout/stat/IoStatYearSearch.vue
index c18f869e..219e4676 100644
--- a/src/views/inout/stat/IoStatYearSearch.vue
+++ b/src/views/inout/stat/IoStatYearSearch.vue
@@ -42,7 +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="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>