出入库明细修改，批次号先进先出

.env.production

@@ -18,7 +18,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8001/UDI_WMS_MC/'
 
 # 诏安总医院
@@ -41,7 +41,7 @@ VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/'
 
 
 # 长泰医院
-# VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
 
 # 三明大田医院
 # VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'

src/views/basic/busType/bussinessType.vue

@@ -232,6 +232,7 @@ export default {
         ullageFill: null,
         scanPreIn: false,
         vailInv: false,
+        vailInvBatchNo: false,
         entrutSpms: null,
         codeFillCheck: true,
         defaultInv: null,
@@ -523,6 +524,7 @@ export default {
         ullageFill: null,
         scanPreIn: false,
         vailInv: false,
+        vailInvBatchNo: false,
         entrutSpms: null,
         codeFillCheck: true,
         defaultInv: null,

src/views/basic/busType/bussinessTypeModify.vue

@@ -444,6 +444,27 @@
             </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.vailInvBatchNo" style="width: 65%"
+                         :disabled="inputQuery.useDyCount!=2 &&( inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1)"
+                         @change="outChange"
+                         placeholder="是否启用"
+              >
+                <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>

src/views/thirdSys/invOrder/thrInvGhOrder.vue

@@ -517,7 +517,7 @@ export default {
      * 手动下载第三方出入库明细
      */
     dlThrInvOrder() {
-      this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-" + this.filterQuery.endDate + "的出入库明细？", "提示", {
+      this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-----" + this.filterQuery.endDate + "的出入库明细？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

src/views/thirdSys/invOrder/thrInvOrder.vue

@@ -193,7 +193,7 @@ import {
   getThrInvOrders,
   getThrInvOrderDetails,
   delThrInvOrderDetail,
-  refreshBill, dlThrInvOrder, dlThrInvFeeOrder
+  refreshBill, dlThrInvOrder, dlThrInvFeeOrder, downloadInvPhOrder
 } from "@/api/thrsys/thrInvOrder";
 import {getBussinessType} from "@/api/basic/bussinessType";
 import {getOriginBusType} from "@/api/basic/busOriginType";
@@ -532,7 +532,7 @@ export default {
       }
     },
     /**
-     * 手动下载第三方出入库明细
+     * 手动下载第三方收费出入库明细
      */
     dlThrInvOrder() {
       this.$confirm("是否确定下载日期范围为：[" + this.filterQuery.startDate + "---" + this.filterQuery.endDate + "]的出入库明细？", "提示", {

src/views/thirdSys/invOrder/thrInvPhOrder.vue

@@ -528,7 +528,7 @@ export default {
      * 手动下载第三方出入库明细
      */
     dlThrInvOrder() {
-      this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-" + this.filterQuery.endDate + "的出入库明细？", "提示", {
+      this.$confirm("是否确定下载日期范围为：" + this.filterQuery.startDate + "-----" + this.filterQuery.endDate + "的出入库明细？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",