From babbc96b8f55778ddbddea2f33704ec3eba8a337 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 26 Feb 2024 15:52:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BD=BF=E7=94=A8=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/busType/bussinessTypeModify.vue     |  7 +++--
 src/views/basic/product/productEdit.vue       | 30 +++++++++++++++----
 src/views/inout/IoCreateScanOrder.vue         |  2 ++
 src/views/system/param/busTypePre.vue         |  2 ++
 src/views/system/param/busTypePreModify.vue   | 16 ++++++++--
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 676cb434..17029a67 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -372,6 +372,7 @@
               >
                 <el-option label="正常" :value="0"></el-option>
                 <el-option label="物资多次使用出库" :value="1"></el-option>
+                <el-option label="科室集合出库" :value="2"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
@@ -387,7 +388,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
-                         :disabled="  inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
+                         :disabled="inputQuery.useDyCount!=2 &&(  inputQuery.advancePreIn==1 || inputQuery.vailInv==1)"
                          @change="outChange"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
@@ -408,7 +409,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
-                         :disabled="  inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
+                         :disabled="inputQuery.useDyCount!=2 &&(  inputQuery.scanPreIn==1 || inputQuery.vailInv==1)"
                          @change="outChange"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
@@ -429,7 +430,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
-                         :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
+                         :disabled="inputQuery.useDyCount!=2 &&( inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1)"
                          @change="outChange"
                          placeholder="是否启用"
               >
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 113382ee..b441ab0f 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -318,20 +318,40 @@
               </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="editQuery.isAdavence" 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>
+                <span class="sptext">采购类型</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="editQuery.isAdavence" style="width: 65%" placeholder="状态" clearable>
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
+                <el-select v-model="editQuery.purType" style="width: 65%" placeholder="选择采购类型" clearable>
+                  <el-option label="普通入账产品" :value="1"></el-option>
+                  <el-option label="预验收产品" :value="2"></el-option>
+                  <el-option label="寄售产品" :value="3"></el-option>
                 </el-select>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">是否寄售</span>
+                <span class="sptext">采购类型</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 610c4c89..09652d17 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -664,6 +664,8 @@ export default {
         .catch(() => {
         });
     },
+
+
     onUpload(data) {
       this.loading = true;
       var idQuery = {
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 2b93f04d..be5196d7 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -149,6 +149,7 @@ export default {
         auditStatus: null,
         busAuditStatus: null,
         createType: null,
+        splitOrder: null,
       },
       enableMap: {
         true: "全量补单",
@@ -302,6 +303,7 @@ export default {
         auditStatus: null,
         busAuditStatus: null,
         createType: null,
+        splitOrder: null,
 
       };
       this.modifyDialogVisible = true;
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 72a7ff5c..8627a21f 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -89,7 +89,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row style="margin-bottom: 20px">
+      <el-row>
 
         <el-col :span="11">
           <el-form-item label="创建单据模式" prop="createType">
@@ -117,7 +117,19 @@
 
           </el-form-item>
         </el-col>
-
+      </el-row>
+      <el-row style="margin-bottom: 20px">
+        <el-col :span="11">
+          <el-form-item label="单据拆单类型" prop="createType">
+            <el-select v-model="inputQuery.splitOrder" placeholder="单据拆单类型" size="small"
+                       style="width: 90%">
+              <el-option label="无需拆单" :value="0"></el-option>
+              <el-option label="按入账库拆单" :value="1"></el-option>
+              <el-option label="按预验收库拆单" :value="2"></el-option>
+              <el-option label="按寄售仓库拆单" :value="3"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="11">
           <el-form-item label="默认补单仓库" prop="defaultInvCode">
             <el-select v-model="inputQuery.defaultInvCode" placeholder="默认补单仓库" clearable size="small"