From 169a2c9cb0b0ecfffa905c55358172cb00de4d3b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 27 Apr 2022 17:34:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=9C=AA=E9=AA=8C=E6=94=B6=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=202.=E4=BF=AE=E6=94=B9=E6=9C=AA=E9=AA=8C=E6=94=B6?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=8F=8A=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=203.=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E4=BA=8C=E6=AC=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E5=8F=82=E6=95=B0=204.=E5=8D=95=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warehouse/stockOrder.js             |    9 +
 src/router/index.js                         |    9 +
 src/views/basic/BussinessTypeModify.vue     |    7 +-
 src/views/warehouse/ioErrorOrder.vue        |    1 +
 src/views/warehouse/ioNewOrder.vue          |    1 +
 src/views/warehouse/stockOrderDelSearch.vue |    2 +
 src/views/warehouse/stockOrderSearch.vue    | 1175 +++++++++----------
 7 files changed, 603 insertions(+), 601 deletions(-)

diff --git a/src/api/warehouse/stockOrder.js b/src/api/warehouse/stockOrder.js
index 97e5da3..49c29a9 100644
--- a/src/api/warehouse/stockOrder.js
+++ b/src/api/warehouse/stockOrder.js
@@ -246,3 +246,12 @@ export function updateStockOrderDetail(query) {
         params: query
     })
 }
+
+//完成验收状态
+export function updateReceiveStatus(params) {
+    return axios({
+        url: "/spms/inout/order/check/updateStatus",
+        method: "post",
+        data: params
+    })
+}
diff --git a/src/router/index.js b/src/router/index.js
index a25c9de..002d2b4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,6 +24,7 @@ import userAccountManage from "@/views/userManage/userAccountManage";
 
 //单据
 import stockOrderDelSearch from "../views/warehouse/stockOrderDelSearch";
+import stockOrderSearch from "../views/warehouse/stockOrderSearch";
 
 //往来单位字典
 import UnitManage from "@/views/product/UnitManage";
@@ -384,6 +385,14 @@ export const asyncRouterMap = [
                 }
 
             },
+            {
+                path: "stockOrderSearch",
+                component: stockOrderSearch,
+                name: "未验收单据",
+                meta: {
+                    authRule: ["stock/stockOrderSearch"]
+                }
+            },
             {
                 path: "stockOrderDelSearch",
                 component: stockOrderDelSearch,
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index 76b5c29..0b5f303 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -121,6 +121,7 @@
                     <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
                     <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">允许手动输入客户信息
                     </el-checkbox>
+                    <el-checkbox v-model="inputQuery.secCheckEnable">是否二次校验</el-checkbox>
                 </div>
             </el-col>
         </el-row>
@@ -130,14 +131,10 @@
 
 <script>
 
-import {
-    getBasicThirdSys
-} from "../../api/basic/basicThirdSys";
-
 import {
     getLocalJoinNoUse
 } from "../../api/basic/busLocalType";
-import { filterAll, filterAllByUser } from "@/api/basic/invWarehouse";
+import { filterAll } from "@/api/basic/invWarehouse";
 import { getCandidateBussinessType } from "../../api/receipts/bussinessType";
 
 export default {
diff --git a/src/views/warehouse/ioErrorOrder.vue b/src/views/warehouse/ioErrorOrder.vue
index 15b46a8..60b0fe3 100644
--- a/src/views/warehouse/ioErrorOrder.vue
+++ b/src/views/warehouse/ioErrorOrder.vue
@@ -228,6 +228,7 @@ export default {
                 mainAction: null,
                 action: null,
                 status: 9,
+                receiveStatus: 0,
                 page: 1,
                 limit: 20
             },
diff --git a/src/views/warehouse/ioNewOrder.vue b/src/views/warehouse/ioNewOrder.vue
index 00d063c..f365eee 100644
--- a/src/views/warehouse/ioNewOrder.vue
+++ b/src/views/warehouse/ioNewOrder.vue
@@ -221,6 +221,7 @@ export default {
                 id: "",
                 mainAction: null,
                 status: 1,
+                receiveStatus: 0,
                 action: null,
                 page: 1,
                 limit: 20
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index 396fcc3..16e320d 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -316,6 +316,7 @@
                     startTime: "",
                     endTime: "",
                     orderId: "",
+                    receiveStatus: null,//验收状态
                     status: 3,
                     page: 1,
                     limit: 10
@@ -541,6 +542,7 @@
             getList() {
                 this.loading = true;
                 this.query.corpId = store.getters.customerId;
+
                 stockOrderList(this.query)
                     .then(response => {
                         this.loading = false;
diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue
index 69036e0..279af25 100644
--- a/src/views/warehouse/stockOrderSearch.vue
+++ b/src/views/warehouse/stockOrderSearch.vue
@@ -12,15 +12,6 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="query.billNo" placeholder="单据号"></el-input>
                     </el-form-item>
-                    <!--                    <el-form-item class="query-form-item">-->
-                    <!--                        <el-select v-model="query.status" placeholder="单据状态">-->
-                    <!--                            <el-option label="全部" value=""></el-option>-->
-                    <!--                            <el-option label="草稿" value="1"></el-option>-->
-                    <!--                            <el-option label="未配货" value="2"></el-option>-->
-                    <!--                            <el-option label="待校验" value="3"></el-option>-->
-                    <!--                            <el-option label="已校验" value="4"></el-option>-->
-                    <!--                        </el-select>-->
-                    <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
                         <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
                             <el-option
@@ -79,22 +70,18 @@
                     width="55">
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="单据来源" prop="sourceType" width="150" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <span>{{ sourceMap[scope.row.sourceType] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="单据日期" prop="billdate" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据号" prop="orderId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位" prop="fromCorp" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据来源" prop="fromType" width="150" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据日期" prop="actDate" show-overflow-tooltip></el-table-column>
                 <el-table-column label="单据状态" show-overflow-tooltip>
                     <template slot-scope="scope">
                         {{ scope.row.status | statusFilterName }}
                     </template>
                 </el-table-column>
-                <el-table-column label="业务类型" prop="billType" show-overflow-tooltip>
+                <el-table-column label="业务类型" prop="action" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <span>{{ getActionName(scope.row.billType) }}</span>
+                        <span>{{ getActionName(scope.row.action) }}</span>
                     </template>
                 </el-table-column>
                 <el-table-column label="当前仓库" prop="locStorageCode" width="150">
@@ -102,33 +89,34 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
-                <!--                <el-table-column label="采购类型" show-overflow-tooltip>-->
-                <!--                    <template slot-scope="scope">-->
-                <!--                        {{ scope.row.type | typeFilterName }}-->
-                <!--                    </template>-->
-                <!--                </el-table-column>-->
                 <el-table-column label="操作" fixed="right" width="200">
                     <template slot-scope="scope">
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            @click.native="qrcodeDetail(scope.row)"-->
-                        <!--                        >码详情-->
-                        <!--                        </el-button-->
-                        <!--                        >-->
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
+                        </el-button
+                        >
                         <el-button
                             type="text"
                             size="small"
                             @click.native="printOrder(scope.row)"
-
-                        >单据打印
+                        >打印
                         </el-button
                         >
                         <el-button
                             type="text"
                             size="small"
                             @click.native="handleDetailForm(scope.$index, scope.row)"
-                        >编辑
+                        >发票
+                        </el-button
+                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="updateReceiveStatus(scope.$index, scope.row)"
+                        >完成验收
                         </el-button
                         >
                     </template>
@@ -145,12 +133,6 @@
         </el-card>
 
         <el-card class="el-card">
-<!--            <el-row style="margin-bottom: 20px;">-->
-<!--                <el-button type="primary" @click="batchSetParams(null,'salesListNo')">批量设置销售清单</el-button>-->
-<!--                <el-button type="primary" @click="batchSetParams(null, 'firstSalesInvNo')">批量设置销售发票第一票</el-button>-->
-<!--                <el-button type="primary" @click="batchSetParams(null, 'secSalesInvNo')">批量设置销售发票第二票</el-button>-->
-<!--            </el-row>-->
-
             <el-table v-loading="detailLoading"
                       :data="detailList"
                       @selection-change="changeFun"
@@ -162,15 +144,20 @@
                 </el-table-column>
 
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
-                <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
-                <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
-
-                <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
+                <el-table-column label="产品通用名" width="200" prop="coName"></el-table-column>
+                <el-table-column label="规格型号" width="200" prop="packSpec"></el-table-column>
+                <el-table-column label="批次号" width="100" prop="lotno"></el-table-column>
+                <el-table-column label="生产日期" width="120" prop="produceDate"></el-table-column>
                 <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
-                <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
-                <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
-                <el-table-column label="价格" width="120" prop="price"></el-table-column>
+                <el-table-column label="数量" width="100" prop="count"></el-table-column>
+                <el-table-column label="单价" width="120" prop="price">
+                    <template slot-scope="scope">
+                        <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.price"
+                                  placeholder="请输入"></el-input>
+                    </template>
+                </el-table-column>
+                <el-table-column label="注册/备案凭证号" width="150" prop="authCode"></el-table-column>
+                <el-table-column label="生产厂家" width="150" prop="productCompany"></el-table-column>
                 <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.secSalesListNo"
@@ -427,607 +414,603 @@
         </el-dialog>
 
         <el-dialog
-            title="码详情"
-            :visible.sync="qrcodeDetailVisible"
-            width="70%"
-            v-if="qrcodeDetailVisible"
-            @close='closeQRCodeDetailDialog'
+            title="单号详情"
+            :visible.sync="codeDetailVisible"
+            width="80%"
+            v-if="codeDetailVisible"
         >
-            <stockOrderQRCodeDetail
-                :closeDialog="closeQRCodeDetailDialog"
+            <codeDetail
                 :idQuery="idQuery"
-            ></stockOrderQRCodeDetail>
+                v-on:closeDetailDialog="closeDetailDialog"
+            ></codeDetail>
         </el-dialog>
 
-        <el-dialog
-            title="码管理"
-            :visible.sync="qrcodeExportVisible"
-            width="60%"
-            v-if="qrcodeExportVisible"
-            @close='closeQRCodeExportDialog'
-        >
-            <stockQRCodeExport
-                :closeDialog="closeQRCodeExportDialog"
-                :idQuery="idQuery"
-            ></stockQRCodeExport>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import {
-    stockOrderList, stockOrderDetail,
-    deleteStockOrderById, deleteStockOrderDetailById,
-    copyStockOrderDetail, submitStockOrder,
-    uploadStockOrderDetail, uploadStockOrderDetailCount,
-    generateStockOrderQRCodeText, updateStockOrderDetail
-} from "../../api/warehouse/stockOrder";
-import stockOrderDistribution from "./stockOrderDistribution";
-import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
-import stockOrderEditDistribution from "./stockOrderEditDistribution";
-import stockQRCodeExport from "./stockQRCodeExport";
-import draggable from "vuedraggable";
-import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
-import store from "../../store";
-import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
-import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
-import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
-
-export default {
-    name: "stockOrderSearch",
-    data() {
-        return {
-            query: {
-                billType: null,
-                corpName: null,
-                locStorageCode: null,
-                startTime: "",
-                endTime: "",
-                billNo: "",
-                status: 4,
-                page: 1,
-                limit: 10
-            },
-            detailQuery: {
-                orderIdFk: "",
-                page: 1,
-                limit: 20
-            },
-            busTypes: [],
-            list: [],
-            detailList: [],
-            currentCheckIndex: -1,
-            multipId: [],
-            batchForm: {
-                secSalesListNo: '',
-                firstSalesInvNo: '',
-                secSalesInvNo: '',
-                invoiceDate: ''
-            },
-            salesListNoFormVisible: false,
-            firstSalesInvNoFormVisible: false,
-            secSalesInvNoFormVisible: false,
-            formLabelWidth: '150px',
-            storageList: [],
-            total: 0,
-            detailTotal: 0,
-            loading: false,
-            detailLoading: false,
-            idQuery: {
-                id: "",
-            },
-            distributionSetVisible: false,
-            stockOrderEditVisible: false,
-            distributionVisible: false,
-            detailFormRules: {
-                batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
-                productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
-                expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
-                sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
-            },
-            sourceMap: {
-                "1": "web端新增单据",
-                "2": "第三方系统",
-                "3": "扫码单据转换",
-            },
-            isSp: store.getters.customerId,
-            detailFormVisible: false,
-            detailFormData: {},
-            detailFormLoading: false,
-            haveDistributionVisible: true,
-            qrcodeDetailVisible: false,
-            qrcodeExportVisible: false,
-            actDateRange: [],
-            pickerOptions: {
-                shortcuts: [
-                    {
-                        text: "最近一周",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-                            picker.$emit("pick", [start, end]);
+    import {
+        stockOrderList, stockOrderDetail,
+        deleteStockOrderById, deleteStockOrderDetailById,
+        copyStockOrderDetail, uploadStockOrderDetail,
+        updateStockOrderDetail, updateReceiveStatus
+    } from "../../api/warehouse/stockOrder";
+    import stockOrderDistribution from "./stockOrderDistribution";
+    import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
+    import stockOrderEditDistribution from "./stockOrderEditDistribution";
+    import stockQRCodeExport from "./stockQRCodeExport";
+    import draggable from "vuedraggable";
+    import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
+    import store from "../../store";
+    import {filterAllByUser} from "@/api/basic/invWarehouse";
+    import {getBusTypeByUser} from "../../api/warehouse/BusRole"
+    import StockOrderEdit from "@/views/warehouse/stockOrderEdit";
+    import codeDetail from "./code";
+
+    export default {
+        name: "stockOrderSearch",
+        data() {
+            return {
+                query: {
+                    billType: null,
+                    corpName: null,
+                    locStorageCode: null,
+                    startTime: "",
+                    endTime: "",
+                    billNo: "",
+                    status: 3,
+                    page: 1,
+                    limit: 10
+                },
+                detailQuery: {
+                    orderIdFk: "",
+                    page: 1,
+                    limit: 20
+                },
+                busTypes: [],
+                list: [],
+                detailList: [],
+                currentCheckIndex: -1,
+                multipId: [],
+                batchForm: {
+                    secSalesListNo: '',
+                    firstSalesInvNo: '',
+                    secSalesInvNo: '',
+                    invoiceDate: ''
+                },
+                salesListNoFormVisible: false,
+                firstSalesInvNoFormVisible: false,
+                secSalesInvNoFormVisible: false,
+                codeDetailVisible: false,
+                formLabelWidth: '150px',
+                storageList: [],
+                total: 0,
+                detailTotal: 0,
+                loading: false,
+                detailLoading: false,
+                idQuery: {
+                    id: "",
+                },
+                distributionSetVisible: false,
+                stockOrderEditVisible: false,
+                distributionVisible: false,
+                detailFormRules: {
+                    batchNo: [
+                        {required: true, message: "请输入批次号", trigger: "blur"}
+                    ],
+                    productDate: [
+                        {required: true, message: "请输入生产日期", trigger: "blur"}
+                    ],
+                    expireDate: [
+                        {required: true, message: "请输入失效日期", trigger: "blur"}
+                    ],
+                    sweepCount: [
+                        {required: true, message: "请输入扫码数量", trigger: "blur"}
+                    ]
+                },
+                sourceMap: {
+                    "1": "web端新增单据",
+                    "2": "第三方系统",
+                    "3": "扫码单据转换",
+                },
+                isSp: store.getters.customerId,
+                detailFormVisible: false,
+                detailFormData: {},
+                detailFormLoading: false,
+                haveDistributionVisible: true,
+                qrcodeDetailVisible: false,
+                qrcodeExportVisible: false,
+                actDateRange: [],
+                pickerOptions: {
+                    shortcuts: [
+                        {
+                            text: "最近一周",
+                            onClick(picker) {
+                                const end = new Date();
+                                const start = new Date();
+                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                                picker.$emit("pick", [start, end]);
+                            },
                         },
-                    },
-                    {
-                        text: "最近一个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-                            picker.$emit("pick", [start, end]);
+                        {
+                            text: "最近一个月",
+                            onClick(picker) {
+                                const end = new Date();
+                                const start = new Date();
+                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                                picker.$emit("pick", [start, end]);
+                            },
                         },
-                    },
-                    {
-                        text: "最近三个月",
-                        onClick(picker) {
-                            const end = new Date();
-                            const start = new Date();
-                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-                            picker.$emit("pick", [start, end]);
+                        {
+                            text: "最近三个月",
+                            onClick(picker) {
+                                const end = new Date();
+                                const start = new Date();
+                                start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                                picker.$emit("pick", [start, end]);
+                            },
                         },
-                    },
-                ],
-            },
-        }
-    },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: ""
-            });
-            this.query = {
-                billNo: "",
-                status: 4,
-                startTime: "",
-                endTime: "",
-                page: 1,
-                limit: 10
-            };
-            this.getList();
-            this.haveDistributionVisible = true;
-            this.actDateRange = [];
-        },
-        onSubmit() {
-            if (this.actDateRange !== null) {
-                this.query.startTime = this.actDateRange[0];
-                this.query.endTime = this.actDateRange[1];
-            } else {
-                this.query.startTime = null;
-                this.query.endTime = null;
+                    ],
+                },
             }
-            this.getList();
-            if (this.query.status === "202" || this.query.status === "502") {
-                this.haveDistributionVisible = true;
-            } else {
-                this.haveDistributionVisible = false;
-            }
-        },
-        handleCurrentChange(val) {
-            this.query.page = val;
-            this.getList();
-        },
-        handleEdit(index, row) {
-            this.currentCheckIndex = index;
-            console.log(this.currentCheckIndex)
-        },
-        handleSave        (index, row) {
-            this.currentCheckIndex = -1;
-
-            updateStockOrderDetail(row).then((res) => {
-                if (res.code == 20000) {
-                    this.$message.success(res.data);
-                }
-            })
-        },
-        changeFun(row) {
-            let _this = this;
-            _this.multipId = []; //每次改动重置ID
-            row.forEach((item) => {
-                _this.multipId.push(item.id);
-            })
-            console.log(this.multipId);
         },
-        batchSetParams(flag, type) {
-            if (flag == '1' && type == 'salesListNo') {
-                this.salesListNoFormVisible = false;
-                this.detailList.forEach(data => {
-                    this.multipId.forEach(id => {
-                        if (data.id == id) {
-                            data.secSalesListNo = this.batchForm.secSalesListNo;
-                            //更新到数据库
-                            updateStockOrderDetail(data);
-                        }
-                    })
-                });
-                //置空批量设置表单
-                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
-            } else if (flag == '1' && type == 'firstSalesInvNo') {
-                this.firstSalesInvNoFormVisible = false;
-                this.detailList.forEach(data => {
-                    this.multipId.forEach(id => {
-                        if (data.id == id) {
-                            data.firstSalesInvNo = this.batchForm.firstSalesInvNo;
-                            //更新到数据库
-                            updateStockOrderDetail(data);
-                        }
-                    })
+        methods: {
+            onReset() {
+                this.$router.push({
+                    path: ""
                 });
-                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
-            } else if (flag == '1' && type == 'secSalesInvNo') {
-                this.secSalesInvNoFormVisible = false;
-                this.detailList.forEach(data => {
-                    this.multipId.forEach(id => {
-                        if (data.id == id) {
-                            data.secSalesInvNo = this.batchForm.secSalesInvNo;
-                            data.invoiceDate = this.batchForm.invoiceDate;
-                            //更新到数据库
-                            updateStockOrderDetail(data);
-                        }
-                    })
-                });
-                Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
-            } else {
-                if (this.multipId.length == 0) {
-                    this.$message.warning("请选择数据");
+                this.query = {
+                    billNo: "",
+                    status: 4,
+                    startTime: "",
+                    endTime: "",
+                    page: 1,
+                    limit: 10
+                };
+                this.getList();
+                this.haveDistributionVisible = true;
+                this.actDateRange = [];
+            },
+            onSubmit() {
+                if (this.actDateRange !== null) {
+                    this.query.startTime = this.actDateRange[0];
+                    this.query.endTime = this.actDateRange[1];
                 } else {
-                    switch (type) {
-                        case 'salesListNo':
-                            this.salesListNoFormVisible = true;
-                            return;
-                        case 'firstSalesInvNo':
-                            this.firstSalesInvNoFormVisible = true;
-                            return;
-                        case 'secSalesInvNo':
-                            this.secSalesInvNoFormVisible = true;
-                            return;
-                        default:
-                            return;
-                    }
+                    this.query.startTime = null;
+                    this.query.endTime = null;
                 }
-            }
-        },
-        detailHandleCurrentChange(val) {
-            this.query.page = val;
-            this.getStockOrderDetailList();
-        },
-        // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
                 this.getList();
-            }
-        },
-        getList() {
-            this.loading = true;
-            this.query.corpId = store.getters.customerId;
-            stockOrderList(this.query)
-                .then(response => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.detailList = [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                    this.detailList = [];
-                });
-        },
-        distributionForm(index, row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.distributionVisible = true;
-            }
-        },
-        closeDialog(type) {
-            this.distributionVisible = false;
-            this.getList();
-            if (this.$isNotBlank(type)) {
-                this.detailList = [];
-            }
-        },
-        printQRCodeText(row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeExportVisible = true;
-            }
-        },
-        printOrder(row) {
-            let tQuery = {
-                queryId: row.id,
+                if (this.query.status === "202" || this.query.status === "502") {
+                    this.haveDistributionVisible = true;
+                } else {
+                    this.haveDistributionVisible = false;
+                }
+            },
+            handleCurrentChange(val) {
+                this.query.page = val;
+                this.getList();
+            },
+            handleEdit(index, row) {
+                this.currentCheckIndex = index;
+                console.log(this.currentCheckIndex)
+            },
+            handleSave(index, row) {
+                this.currentCheckIndex = -1;
 
-            }
-            this.loading = true;
-            inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
-                if (response.code === 20000) {
-                    tQuery = {
-                        id: row.id,
-                        orderName: "送货单",
+                updateStockOrderDetail(row).then((res) => {
+                    if (res.code == 20000) {
+                        this.$message.success(res.data);
                     }
-                    stockOrderPDFFromTemplateFile(tQuery).then((response) => {
-                        //将pdf文件转换为url。
-                        const binaryData = [];
-                        binaryData.push(response);
-                        //获取blob链接。
-                        let url = window.URL.createObjectURL(
-                            new Blob(binaryData, {type: "application/pdf"})
-                        );
-                        this.loading = false;
-                        window.open(url);//打开新标签页，预览pdf。
-                    }).catch(() => {
-                        this.loading = false;
+                })
+            },
+            changeFun(row) {
+                let _this = this;
+                _this.multipId = []; //每次改动重置ID
+                row.forEach((item) => {
+                    _this.multipId.push(item.id);
+                })
+                console.log(this.multipId);
+            },
+            batchSetParams(flag, type) {
+                if (flag == '1' && type == 'salesListNo') {
+                    this.salesListNoFormVisible = false;
+                    this.detailList.forEach(data => {
+                        this.multipId.forEach(id => {
+                            if (data.id == id) {
+                                data.secSalesListNo = this.batchForm.secSalesListNo;
+                                //更新到数据库
+                                updateStockOrderDetail(data);
+                            }
+                        })
+                    });
+                    //置空批量设置表单
+                    Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
+                } else if (flag == '1' && type == 'firstSalesInvNo') {
+                    this.firstSalesInvNoFormVisible = false;
+                    this.detailList.forEach(data => {
+                        this.multipId.forEach(id => {
+                            if (data.id == id) {
+                                data.firstSalesInvNo = this.batchForm.firstSalesInvNo;
+                                //更新到数据库
+                                updateStockOrderDetail(data);
+                            }
+                        })
                     });
+                    Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
+                } else if (flag == '1' && type == 'secSalesInvNo') {
+                    this.secSalesInvNoFormVisible = false;
+                    this.detailList.forEach(data => {
+                        this.multipId.forEach(id => {
+                            if (data.id == id) {
+                                data.secSalesInvNo = this.batchForm.secSalesInvNo;
+                                data.invoiceDate = this.batchForm.invoiceDate;
+                                //更新到数据库
+                                updateStockOrderDetail(data);
+                            }
+                        })
+                    });
+                    Object.keys(this.batchForm).forEach(key => this.batchForm[key] = '');
                 } else {
-                    this.loading = false;
-                    this.$message.error(response.message);
+                    if (this.multipId.length == 0) {
+                        this.$message.warning("请选择数据");
+                    } else {
+                        switch (type) {
+                            case 'salesListNo':
+                                this.salesListNoFormVisible = true;
+                                return;
+                            case 'firstSalesInvNo':
+                                this.firstSalesInvNoFormVisible = true;
+                                return;
+                            case 'secSalesInvNo':
+                                this.secSalesInvNoFormVisible = true;
+                                return;
+                            default:
+                                return;
+                        }
+                    }
                 }
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        closeQRCodeExportDialog() {
-            this.qrcodeExportVisible = false;
-            this.getList();
-        },
-        qrcodeDetail(row) {
-            this.idQuery.id = '';
-            if (this.$isNotBlank(row.id)) {
-                this.idQuery.id = row.id;
-                this.idQuery.formData = row;
-                this.qrcodeDetailVisible = true;
-            }
-        },
-        closeQRCodeDetailDialog() {
-            this.qrcodeDetailVisible = false;
-            this.getList();
-        },
-        getStockOrderDetailList(row) {
-            if (this.$isNotBlank(row)) {
-                this.detailQuery.orderIdFk = row.id;
-            }
-            this.detailLoading = true;
-            stockOrderDetail(this.detailQuery)
-                .then((response) => {
-                    console.log(response)
-                    this.detailLoading = false;
-                    this.detailList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.detailLoading = false;
-                    this.detailList = [];
-                });
-        },
-        deleteStockOrder(row) {
-            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
+            },
+            detailHandleCurrentChange(val) {
+                this.query.page = val;
+                this.getStockOrderDetailList();
+            },
+            // 刷新表单
+            resetForm() {
+                if (this.$refs["dataForm"]) {
+                    // 清空验证信息表单
+                    this.$refs["dataForm"].clearValidate();
+                    // 刷新表单
+                    this.$refs["dataForm"].resetFields();
+                    this.getList();
+                }
+            },
+            getList() {
                 this.loading = true;
-                deleteStockOrderById({id: row.id})
+                this.query.corpId = store.getters.customerId;
+                this.query.receiveStatus = 0;
+                stockOrderList(this.query)
                     .then(response => {
                         this.loading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(response.data);
-                            this.getList();
-                            this.detailList = [];
-                        } else {
-                            this.$message.error(response.message);
-                        }
+                        this.list = response.data.list || [];
+                        this.total = response.data.total || 0;
+                        this.detailList = [];
                     })
                     .catch(() => {
                         this.loading = false;
-                    })
-            }).catch(() => {
-
-            });
-        },
-        copyDetail(row) {
-            this.$confirm("是否复制该记录?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
+                        this.list = [];
+                        this.total = 0;
+                        this.detailList = [];
+                    });
+            },
+            distributionForm(index, row) {
+                this.idQuery.id = '';
+                if (this.$isNotBlank(row.id)) {
+                    this.idQuery.id = row.id;
+                    this.idQuery.formData = row;
+                    this.distributionVisible = true;
+                }
+            },
+            closeDialog(type) {
+                this.distributionVisible = false;
+                this.getList();
+                if (this.$isNotBlank(type)) {
+                    this.detailList = [];
+                }
+            },
+            printQRCodeText(row) {
+                this.idQuery.id = '';
+                if (this.$isNotBlank(row.id)) {
+                    this.idQuery.id = row.id;
+                    this.idQuery.formData = row;
+                    this.qrcodeExportVisible = true;
+                }
+            },
+            printOrder(row) {
                 let tQuery = {
-                    id: row.id
+                    queryId: row.id,
+                    moduleId: 4
+                };
+                this.loading = true;
+                inspectionStockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                    if (response.code === 20000) {
+                        tQuery = {
+                            orderId: row.orderId,
+                            moduleId: 4
+                        }
+                        stockOrderPDFFromTemplateFile(tQuery).then((response) => {
+                            //将pdf文件转换为url。
+                            const binaryData = [];
+                            binaryData.push(response);
+                            //获取blob链接。
+                            let url = window.URL.createObjectURL(
+                                new Blob(binaryData, {type: "application/pdf"})
+                            );
+                            this.loading = false;
+                            window.open(url);//打开新标签页，预览pdf。
+                        }).catch(() => {
+                            this.loading = false;
+                        });
+                    } else {
+                        this.loading = false;
+                        this.$message.error(response.message);
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                });
+            },
+            closeQRCodeExportDialog() {
+                this.qrcodeExportVisible = false;
+                this.getList();
+            },
+            qrcodeDetail(row) {
+                this.idQuery.id = '';
+                if (this.$isNotBlank(row.id)) {
+                    this.idQuery.id = row.id;
+                    this.idQuery.formData = row;
+                    this.qrcodeDetailVisible = true;
+                }
+            },
+            closeQRCodeDetailDialog() {
+                this.qrcodeDetailVisible = false;
+                this.getList();
+            },
+            getStockOrderDetailList(row) {
+                if (this.$isNotBlank(row)) {
+                    this.detailQuery.orderIdFk = row.orderId;
                 }
                 this.detailLoading = true;
-                copyStockOrderDetail(tQuery)
+                stockOrderDetail(this.detailQuery)
                     .then((response) => {
+                        console.log(response)
                         this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("复制成功");
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
-                    });
-            }).catch(() => {
-            });
-        },
-        deleteStockOrderDetail(row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.detailLoading = true;
-                deleteStockOrderDetailById({id: row.id})
-                    .then(response => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success(response.data);
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$message.error(response.message);
-                        }
+                        this.detailList = response.data || [];
                     })
                     .catch(() => {
                         this.detailLoading = false;
-                    })
-            }).catch(() => {
-
-            });
-        },
-        // 显示表单
-        handleDetailForm(index, row) {
-            // this.detailFormVisible = true;
-            // this.detailFormData = {};
-            // if (row !== null) {
-            //     this.detailFormData = Object.assign({}, row);
-
-            this.stockOrderEditVisible = true;
+                        this.detailList = [];
+                    });
+            },
+            deleteStockOrder(row) {
+                this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }).then(() => {
+                    this.loading = true;
+                    deleteStockOrderById({id: row.id})
+                        .then(response => {
+                            this.loading = false;
+                            if (response.code === 20000) {
+                                this.$message.success(response.data);
+                                this.getList();
+                                this.detailList = [];
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.loading = false;
+                        })
+                }).catch(() => {
 
+                });
+            },
+            copyDetail(row) {
+                this.$confirm("是否复制该记录?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }).then(() => {
+                    let tQuery = {
+                        id: row.id
+                    }
+                    this.detailLoading = true;
+                    copyStockOrderDetail(tQuery)
+                        .then((response) => {
+                            this.detailLoading = false;
+                            if (response.code === 20000) {
+                                this.$message.success("复制成功");
+                                this.getStockOrderDetailList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        });
+                }).catch(() => {
+                });
+            },
+            deleteStockOrderDetail(row) {
+                this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }).then(() => {
+                    this.detailLoading = true;
+                    deleteStockOrderDetailById({id: row.id})
+                        .then(response => {
+                            this.detailLoading = false;
+                            if (response.code === 20000) {
+                                this.$message.success(response.data);
+                                this.getStockOrderDetailList();
+                            } else {
+                                this.$message.error(response.message);
+                            }
+                        })
+                        .catch(() => {
+                            this.detailLoading = false;
+                        })
+                }).catch(() => {
 
-        },
-        hideDetailForm() {
-            // 更改值
-            this.detailFormVisible = !this.detailFormVisible;
-            return true;
-        },
-        getActionName(action) {
-            for (let i = 0; i < this.busTypes.length; i++) {
-                if (this.busTypes[i].localAction === action) {
-                    return this.busTypes[i].localName;
+                });
+            },
+            // 显示表单
+            handleDetailForm(index, row) {
+                this.stockOrderEditVisible = true;
+            },
+            hideDetailForm() {
+                // 更改值
+                this.detailFormVisible = !this.detailFormVisible;
+                return true;
+            },
+            getActionName(action) {
+                for (let i = 0; i < this.busTypes.length; i++) {
+                    if (this.busTypes[i].action === action) {
+                        return this.busTypes[i].name;
+                    }
                 }
-            }
-        },
-        getBusType() {
-            let query = {
-                enabled: true,
-            };
-            getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
+            },
+            getBusType() {
+                let query = {};
+                getBusTypeByUser(query).then((res) => {
+                    this.busTypes = res.data.list || [];
                     this.filterQuery.billAction = this.busTypes[0].action;
-                    // this.getList();
-                })
-                .catch(() => {
+                    console.log(this.busTypes)
+                }).catch((error) => {
                 });
-        },
-        getStorageName(code) {
-            for (let i = 0; i < this.storageList.length; i++) {
-                if (this.storageList[i].code === code) {
-                    return this.storageList[i].name;
+            },
+            getStorageName(code) {
+                for (let i = 0; i < this.storageList.length; i++) {
+                    if (this.storageList[i].code === code) {
+                        return this.storageList[i].name;
+                    }
                 }
-            }
-        },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-        submitUploadDetail() {
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    this.detailLoading = true;
-                    let tQuery = this.detailFormData;
-                    uploadStockOrderDetail(tQuery).then((response) => {
-                        this.detailLoading = false;
-                        if (response.code === 20000) {
-                            this.$message.success("修改完成");
-                            this.hideDetailForm();
-                            this.getStockOrderDetailList();
-                        } else {
-                            this.$alert(response.message, '提示', {
-                                confirmButtonText: '确定',
-                                type: 'warning',
-                                closeOnClickModal: true,
-                                callback: action => {
-                                    this.$refs.inputRef.focus();
-                                }
-                            });
-                        }
+            },
+            getStorage() {
+                this.storageList = [];
+                filterAllByUser()
+                    .then((response) => {
+                        this.storageList = response.data || [];
+                    })
+                    .catch(() => {
                     });
-                }
-            });
+            },
+            submitUploadDetail() {
+                this.$refs["dataForm"].validate(valid => {
+                    if (valid) {
+                        this.detailLoading = true;
+                        let tQuery = this.detailFormData;
+                        uploadStockOrderDetail(tQuery).then((response) => {
+                            this.detailLoading = false;
+                            if (response.code === 20000) {
+                                this.$message.success("修改完成");
+                                this.hideDetailForm();
+                                this.getStockOrderDetailList();
+                            } else {
+                                this.$alert(response.message, '提示', {
+                                    confirmButtonText: '确定',
+                                    type: 'warning',
+                                    closeOnClickModal: true,
+                                    callback: action => {
+                                        this.$refs.inputRef.focus();
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
+            },
+            //更新验收状态
+            updateReceiveStatus(index, row){
+                let params = {
+                    orderId: row.orderId
+                };
+                updateReceiveStatus(params).then((res) => {
+                    this.$message.success("验收成功");
+                    this.getList();
+                }).error((error) => {
+                    this.$message.error("验收失败");
+                    console.log(error);
+                })
+            },
+            intentDetail(row) {
+                this.codeDetailVisible = true;
+                this.idQuery.id = row.orderId;
+            }
         }
-    }
-    ,
-    components: {
-        StockOrderEdit,
-        draggable,
-        stockOrderDistribution,
-        stockOrderEditDistribution,
-        stockOrderQRCodeDetail,
-        stockQRCodeExport,
-    }
-    ,
-    filters: {
-        statusFilterType(status) {
-            const statusMap = {
-                0: "gray",
-                1: "success"
-            };
-            return statusMap[status];
+        ,
+        components: {
+            codeDetail,
+            StockOrderEdit,
+            draggable,
+            stockOrderDistribution,
+            stockOrderEditDistribution,
+            stockOrderQRCodeDetail,
+            stockQRCodeExport,
         }
         ,
-        statusFilterName(status) {
-            const statusMap = {
-                "1": "草稿",
-                "2": "未配货",
-                "3": "待校验",
-                "4": "已校验",
-            };
-            return statusMap[status];
+        filters: {
+            statusFilterType(status) {
+                const statusMap = {
+                    0: "gray",
+                    1: "success"
+                };
+                return statusMap[status];
+            }
+            ,
+            statusFilterName(status) {
+                const statusMap = {
+                    "1": "草稿",
+                    "2": "未配货",
+                    "3": "待校验",
+                    "4": "已校验",
+                };
+                return statusMap[status];
+            }
+            ,
+            typeFilterName(type) {
+                const typeMap = {
+                    1: "预入库",
+                    2: "普通采购",
+                };
+                return typeMap[type];
+            }
         }
         ,
-        typeFilterName(type) {
-            const typeMap = {
-                1: "预入库",
-                2: "普通采购",
-            };
-            return typeMap[type];
+        created() {
+            this.getStorage();
+            this.getBusType();
+            let end = new Date();
+            let start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            this.actDateRange = [start, end];
+            this.getList();
         }
     }
-    ,
-    created() {
-        this.getStorage();
-        this.getBusType();
-        let end = new Date();
-        let start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        this.actDateRange = [start, end];
-        this.getList();
-    }
-}
 </script>
 
 <style scoped>
 
-.el-dialog {
-    display: flex;
-    flex-direction: column;
-    margin: 0 !important;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
+    .el-dialog {
+        display: flex;
+        flex-direction: column;
+        margin: 0 !important;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
 
-.el-dialog .el-dialog__body {
-    flex: 1;
-    overflow: auto;
-}
+    .el-dialog .el-dialog__body {
+        flex: 1;
+        overflow: auto;
+    }
 </style>