单据预验收功能带回功能

src/views/basic/BussinessTypeLocl.vue

@@ -164,7 +164,9 @@ export default {
                 changeEnable: null,
                 spUse: null,
                 prefix: null,
-                preIn: null, supplementAll: false,
+                preIn: null,
+                preInBack: null,
+                supplementAll: false,
             },
             enableMap: {
                 true: "是",
@@ -273,6 +275,7 @@ export default {
                 spUse: row.spUse,
                 prefix: row.prefix,
                 preIn: row.preIn,
+                preInBack: row.preInBack,
                 supplementAll: row.supplementAll,
             };
         },
@@ -292,6 +295,7 @@ export default {
                 changeEnable: null,
                 prefix: null,
                 preIn: null,
+                preInBack: null,
             };
         },
 

src/views/basic/BussinessTypeLoclModify.vue

@@ -118,6 +118,14 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.preInBack" @change="preInChange"
+                                 :disabled="!inputQuery.preIn">
+                        预验收带回
+                    </el-checkbox>
+                </div>
+            </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
                     <el-checkbox v-model="inputQuery.spUse">允许供应商使用</el-checkbox>

src/views/business/stockOrderSearch.vue

@@ -503,13 +503,13 @@ import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalT
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 import StockOrderEdit from "@/views/business/stockOrderEdit";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
-import {convertDate} from  "@/utils/date"
+import {convertDate} from "@/utils/date"
 
 export default {
     name: "stockOrderSearch",
     data() {
         return {
-            convertDateFun:convertDate,
+            convertDateFun: convertDate,
             query: {
                 billType: null,
                 corpName: null,
@@ -769,10 +769,10 @@ export default {
         },
         parentByFn: function (childValue) {
             this.getList();
-         },
-         acceptOrderFn: function (childValue) {
+        },
+        acceptOrderFn: function (childValue) {
             this.getList();
-         },
+        },
         distributionForm(index, row) {
             this.idQuery.id = '';
             if (this.$isNotBlank(row.id)) {
@@ -1075,7 +1075,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                let param = {billNo: row.billNo,contrastStatus:2};
+                let param = {billNo: row.billNo, contrastStatus: null};
                 rollbackOrder(param).then((res) => {
                     if (res.code === 20000) {
                         this.$message.success("回退成功");