单据类型界面修改

src/api/basic/busOriginType.js

@@ -44,3 +44,12 @@ export function getOriginJoinBusType(query) {
         params: query
     });
 }
+
+export function selectList(query) {
+  return axios({
+    url: "/udiwms/busType/selectList",
+    method: "get",
+    params: query
+  });
+}
+

src/views/basic/busType/bussinessType.vue

@@ -226,7 +226,7 @@ export default {
         originAction: null,
         checkBalance: null,
         secCheckBalance: null,
-        preInBack: true,
+        preInBack: false,
         vailDispatch: false,
         vailGroupBuy: 0,
         inStock: false,
@@ -243,7 +243,8 @@ export default {
         thrCheckChange: null,
         thrCheckBalance: null,
         thrCheckCopy: null,
-        checkVailDate: false, //校验近效期
+        advancePreIn:false,
+        checkVailDate: 0, //校验近效期
         checkExpire: true,   //校验过期
         checkCertExpire: false, //校验证书过期
 
@@ -338,6 +339,18 @@ export default {
         this.$message.error("请选择是否更改库存！");
         return;
       }
+
+      if(this.inputQuery.preInBack==1){
+        if(isBlank(this.inputQuery.backPreinType)){
+          this.$message.error("请选择预验收剩余库存退库方式！");
+          return;
+        }
+        if(isBlank(this.inputQuery.preInBackAction)){
+          this.$message.error("请选择预验收退库单据类型！");
+          return;
+        }
+
+      }
       // if (isBlank(this.inputQuery.busType)) {
       //   this.$message.error("请选择特定页面！");
       //   return;
@@ -472,7 +485,7 @@ export default {
         advanceType: null,
         preIn: null,
         originAction: null,
-        preInBack: true,
+        preInBack: false,
         vailDispatch: false,
         vailGroupBuy: 0,
         inStock: false,
@@ -488,10 +501,11 @@ export default {
         thrCheckChange: null,
         thrCheckBalance: null,
         thrCheckCopy: null,
-
+        advancePreIn:false,
-        checkVailDate: false, //校验近效期
+        checkVailDate: 0, //校验近效期
         checkExpire: true,   //校验过期
         checkCertExpire: false, //校验证书过期
+        backPreinType:1,
       }
       this.addDialogVisible = true;
     },

src/views/basic/busType/bussinessTypeModify.vue

@@ -154,8 +154,9 @@
           <el-form-item label="是否检查近效期" prop="prefix">
             <el-select v-model="inputQuery.checkVailDate"
                        style="width: 90%" placeholder="" clearable>
-              <el-option label="是" :value="true"></el-option>
+              <el-option label="不处理" :value=0></el-option>
-              <el-option label="否" :value="false"></el-option>
+              <el-option label="弹框提醒" :value=1></el-option>
+              <el-option label="禁止录入" :value=2></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -309,29 +310,6 @@
             </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.preInBack"
-                         :disabled="inputQuery.actionType != 2 || inputQuery.mainAction!='WareHouseIn' ||
-                                inputQuery.corpType != 2 || inputQuery.inStock==false "
-                         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-collapse-item>
 
         <el-collapse-item title="出库单据设置" v-if="inputQuery.mainAction!='WareHouseIn'">
@@ -359,7 +337,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.actionType !== 2"
+                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
                          placeholder="是否启用" clearable>
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -372,6 +350,26 @@
           </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.advancePreIn" style="width: 65%"
+                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
+                         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>
@@ -379,7 +377,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
-                         :disabled=" inputQuery.mainAction!= 'WareHouseOut'"
+                         :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
                          placeholder="是否启用" clearable
               >
                 <el-option label="启用" :value="true"></el-option>
@@ -414,6 +412,69 @@
           </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.preInBack"
+                         :disabled="inputQuery.scanPreIn ==false "  @change="getPreInBack"
+                         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 v-if="inputQuery.preInBack==true">
+            <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.backPreinType" style="width: 65%" clearable>
+                <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-row v-if="inputQuery.preInBack==true && inputQuery.backPreinType==1 ">
+            <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.preInBackAction" style="width: 65%" clearable>
+                <el-option
+                  v-for="item in preInBackList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </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-collapse-item>
 
         <el-collapse-item title="是否校验业务单设置">
@@ -1067,7 +1128,7 @@
 import {candidateBusType} from '@/api/basic/busType'
 import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
 import {isBlank} from '@/utils/strUtil'
-import {getOriginBusType} from '@/api/basic/busOriginType'
+import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
 import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
 
 export default {
@@ -1114,6 +1175,7 @@ export default {
         isBuType: true,
         isFilterBind: true
       },
+      preInBackList: [],
       orderTypeList: [],
       fromSpecialOptions: [],
       originTypes: [],
@@ -1201,6 +1263,19 @@ export default {
 
     },
 
+    selectBussinessList(){
+      selectList().then((res) => {
+        this.preInBackList=res.data;
+      })
+    },
+    getPreInBack(){
+      if(this.inputQuery.preInBack==false){
+        this.inputQuery.preInBackAction=null;
+        this.inputQuery.backPreinType='';
+      }else{
+        this.inputQuery.backPreinType=1;
+      }
+    },
     //获取单据类型
     getOrderType() {
       this.orderTypeList = []
@@ -1281,9 +1356,14 @@ export default {
     }
     this.getList()
     this.findSpecialMethod()
+    this.selectBussinessList()
     this.oldData = Object.assign({}, this.inputQuery)
-    this.inputQuery.codeFillCheck=false;
+    debugger
-    this.inputQuery.preInBack=false;
+    if(this.inputQuery.id==null || this.inputQuery.id==''){
+      this.inputQuery.codeFillCheck=false;
+      this.inputQuery.preInBack=false;
+    }
+
   }
 
 }