From e0c38e054793918d8fd1b3127fca00cd51a71709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Tue, 18 Apr 2023 17:54:05 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E9=80=89=E5=85=A5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |   1 -
 src/api/inout/order.js                      |   9 +-
 src/views/inout/DialogCreateOrder.vue       | 576 ++++++++-------
 src/views/inout/DialogCreateOrderSelect.vue | 732 ++++++++++++++++++++
 vue.config.js                               |   2 +-
 5 files changed, 1075 insertions(+), 245 deletions(-)
 create mode 100644 src/views/inout/DialogCreateOrderSelect.vue

diff --git a/package.json b/package.json
index 203c7865..57441c3d 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
     "echarts": "4.9.0",
-    "element-china-area-data": "^5.0.2",
     "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index b9bd4988..25cce1da 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -421,8 +421,13 @@ export function getOrderList(params) {
     params: params
   });
 }
-
-
+export function getOrderFilter(params) {
+  return axios({
+    url: "udiwms/inout/preInorder/filter",
+    method: "get",
+    params: params
+  });
+}
 export function updateStatus(query) {
   return axios({
     url: "/spms/inout/order/web/updateStatus",
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 1e187225..59006fdf 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1,30 +1,39 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
-      <el-form :model="orderFormData" :rules="formRules" ref="dataForm" label-width="100px"
-               style="margin-bottom: -15px">
-        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+    <el-card style="margin: 5px; margin-top: -20px">
+      <el-form
+        :model="orderFormData"
+        :rules="formRules"
+        ref="dataForm"
+        label-width="100px"
+        style="margin-bottom: -15px"
+      >
+        <el-button-group
+          style="display: flex; margin: 0px 0 10px 80%; height: 35px"
+        >
           <el-button
             size="mini"
             type="primary"
-            @click.native="saveOrder()"
-          >草稿保存
-          </el-button
-          >
-          <el-button
-            size="mini"
-            type="primary"
-            @click.native="submit()"
-          >立即提交
-          </el-button
-          >
+            @click.native="OptionalDocument()"
+            >选入预验收库单
+          </el-button>
+          <el-button size="mini" type="primary" @click.native="saveOrder()"
+            >草稿保存
+          </el-button>
+          <el-button size="mini" type="primary" @click.native="submit()"
+            >立即提交
+          </el-button>
         </el-button-group>
         <el-row>
           <el-col :span="11">
             <el-form-item prop="corpOrderId" label="单据号:">
-              <el-input v-model="orderFormData.corpOrderId" auto-complete="off" style="width: 90%"
-                        clearable
-                        :disabled="corpOrderIdDisabled"></el-input>
+              <el-input
+                v-model="orderFormData.corpOrderId"
+                auto-complete="off"
+                style="width: 90%"
+                clearable
+                :disabled="corpOrderIdDisabled"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
@@ -45,15 +54,19 @@
         <el-row>
           <el-col :span="11">
             <el-form-item prop="action" label="单据类型:">
-              <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
-                         :disabled="corpOrderIdDisabled"
-                         style="width: 90%"
-                         @change="actionChange">
+              <el-select
+                v-model="orderFormData.action"
+                placeholder="请选择单据类型"
+                :disabled="corpOrderIdDisabled"
+                style="width: 90%"
+                @change="actionChange"
+              >
                 <el-option
                   v-for="item in busTypeOptions"
                   :key="item.name"
                   :label="item.name"
-                  :value="item.action">
+                  :value="item.action"
+                >
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
@@ -62,29 +75,39 @@
 
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
-              <el-select v-model="orderFormData.invCode" placeholder="当前仓库"
-                         style="width: 90%"
-                         :disabled="corpOrderIdDisabled" @change="changeInv" filterable>
+              <el-select
+                v-model="orderFormData.invCode"
+                placeholder="当前仓库"
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                @change="changeInv"
+                filterable
+              >
                 <el-option
                   v-for="item in curInvOptions"
                   :key="item.name"
                   :label="item.name"
-                  :value="item.code">
+                  :value="item.code"
+                >
                   <span style="float: left">{{ item.name }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.warehouseName
-                    }}</span>
+                    item.warehouseName
+                  }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="11">
-            <el-form-item prop="fromCorp"
-                          label="往来信息:"
-                          v-if="curAction.corpType === 0 || curAction.corpType === 2 || (curAction.corpType === 1 && !curAction.genUnit)"
+            <el-form-item
+              prop="fromCorp"
+              label="往来信息:"
+              v-if="
+                curAction.corpType === 0 ||
+                curAction.corpType === 2 ||
+                (curAction.corpType === 1 && !curAction.genUnit)
+              "
             >
               <el-select
                 v-model="orderFormData.fromCorp"
@@ -108,68 +131,82 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item prop="fromCorp"
-                          v-if="curAction.corpType ==3"
-                          label="往来信息:"
+            <el-form-item
+              prop="fromCorp"
+              v-if="curAction.corpType == 3"
+              label="往来信息:"
             >
-              <el-select v-model="orderFormData.fromInvCode" placeholder="请选择往来仓库"
-                         :disabled="corpOrderIdDisabled" filterable
-                         clearable
-                         style="width: 90%"
+              <el-select
+                v-model="orderFormData.fromInvCode"
+                placeholder="请选择往来仓库"
+                :disabled="corpOrderIdDisabled"
+                filterable
+                clearable
+                style="width: 90%"
               >
                 <el-option
                   v-for="item in fromInvOptions"
                   :key="item.code"
                   :label="item.name"
-                  :value="item.code">
+                  :value="item.code"
+                >
                   <span style="float: left">{{ item.name }}</span>
                   <span style="float: right; color: #8492a6; font-size: 13px">{{
-                      item.code
-                    }}</span>
+                    item.code
+                  }}</span>
                 </el-option>
               </el-select>
-
             </el-form-item>
-            <el-form-item prop="fromCorp" label="往来信息:"
-                          v-if="curAction.corpType ==1 && curAction.genUnit">
-              <el-input v-model="orderFormData.fromCorp" auto-complete="off"
-                        clearable
-                        style="width: 90%"
-                        :disabled="corpOrderIdDisabled"
-                        placeholder="请输入病人住院号"
+            <el-form-item
+              prop="fromCorp"
+              label="往来信息:"
+              v-if="curAction.corpType == 1 && curAction.genUnit"
+            >
+              <el-input
+                v-model="orderFormData.fromCorp"
+                auto-complete="off"
+                clearable
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                placeholder="请输入病人住院号"
               ></el-input>
             </el-form-item>
-
           </el-col>
           <el-col :span="11">
             <el-form-item prop="remark" label="备注:">
-              <el-input v-model="orderFormData.remark" auto-complete="off"
-                        clearable
-                        style="width: 90%"
-                        placeholder="请输入备注信息"
+              <el-input
+                v-model="orderFormData.remark"
+                auto-complete="off"
+                clearable
+                style="width: 90%"
+                placeholder="请输入备注信息"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="errView==1">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="" label="预验收单据:">
+              <el-input v-model="orderFormData.Acceptance"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="errView == 1">
           <el-col :span="20">
             <el-form-item prop="errMsg" label="异常信息:">
-              <el-input
-                v-model="orderFormData.errMsg"
-                disabled
-              ></el-input>
+              <el-input v-model="orderFormData.errMsg" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="viewType!=1">
+        <el-row v-if="viewType != 1">
           <el-col :span="20">
             <el-form-item prop="code" label="扫码录入校验:">
               <el-input
                 id="inputer"
                 @focus="getInputFocus($event)"
                 @keypress.enter.native="enterKey($event)"
-                ref='inputRef'
-                style="ime-mode:disabled"
+                ref="inputRef"
+                style="ime-mode: disabled"
                 type="tel"
                 v-model="codeFormData.code"
               ></el-input>
@@ -180,74 +217,100 @@
               type="primary"
               size="mini"
               @click.native.stop="addCode()"
-              style=" margin-left: 15px"
-            >添加
-            </el-button
-            >
+              style="margin-left: 15px"
+              >添加
+            </el-button>
           </el-col>
         </el-row>
-
-
       </el-form>
     </el-card>
     <el-tabs type="border-card" style="margin: 5px">
       <el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
-        <biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
-                          :viewType="viewType"
-                          :curBustype="curAction"
-                          v-if="isBizDetailAlive"></biz-detail-panel>
+        <biz-detail-panel
+          :idQuery="orderFormData"
+          :refreshPanel="refreshCodesPanel"
+          :refreshOrder="refreshOrder"
+          :viewType="viewType"
+          :curBustype="curAction"
+          v-if="isBizDetailAlive"
+        ></biz-detail-panel>
       </el-tab-pane>
       <el-tab-pane label="扫码详情" v-if="viewCodeVisible">
-        <codeDetailPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel"
-                         :viewType="viewType"
-                         v-if="isCodeDetailAlive"></codeDetailPanel>
+        <codeDetailPanel
+          :idQuery="orderFormData"
+          :refreshPanel="refreshCodesPanel"
+          :viewType="viewType"
+          v-if="isCodeDetailAlive"
+        ></codeDetailPanel>
       </el-tab-pane>
       <el-tab-pane label="扫码明细" v-if="viewCodeDetailVisible">
-        <codesPanel :idQuery="orderFormData"
-                    :refreshPanel="refreshCodesPanel"
-                    v-if="isCodeAlive"
-                    :viewType="viewType"
-                    :selectRlTitle="selectRlTitle"
-                    :editTitle="editTitle"
-                    :selectUnitTitle="selectUnitTitle"></codesPanel>
+        <codesPanel
+          :idQuery="orderFormData"
+          :refreshPanel="refreshCodesPanel"
+          v-if="isCodeAlive"
+          :viewType="viewType"
+          :selectRlTitle="selectRlTitle"
+          :editTitle="editTitle"
+          :selectUnitTitle="selectUnitTitle"
+        ></codesPanel>
       </el-tab-pane>
     </el-tabs>
 
-
     <el-dialog
       :title="editTitle"
       :visible.sync="editOriginCodeVisible"
-      append-to-body width="70%"
+      append-to-body
+      width="70%"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      v-if="editOriginCodeVisible">
+      v-if="editOriginCodeVisible"
+    >
       <editCodeDialog
         :closeCodeDialog="closeCodeDialog"
         :repeatAddCode="repeatAddCode"
         :codeDetail="codeFormData"
-        editType="1">
+        editType="1"
+      >
       </editCodeDialog>
     </el-dialog>
-
+    <!-- 选入预验收库单 -->
+    <el-dialog
+      title="选入预验收库单"
+      :visible.sync="selectorder"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="70%"
+      v-if="selectorder"
+      append-to-body
+      @close="closeDialogtwo"
+    >
+      <dialog-create-order-select @giveselectbox="giveselectbox" :closeDialogtwo="closeDialogtwo">
+      </dialog-create-order-select>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  submitBiz, addOrderWeb, submitCodes, submitOrderWeb, saveOrderWeb,
-  updateCodeBindSup, enterCodeWeb
+  submitBiz,
+  addOrderWeb,
+  submitCodes,
+  submitOrderWeb,
+  saveOrderWeb,
+  updateCodeBindSup,
+  enterCodeWeb,
 } from "../../api/inout/order";
-import {findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
-import {parseTime} from "../../utils/coTools";
-import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
+import { findByFrom, findInvByUser } from "../../api/system/invSubWarehouse";
+import { parseTime } from "../../utils/coTools";
+import { getBasicUnitMaintains } from "../../api/basic/basicUnitMaintain";
 import editCodeDialog from "./DialogEditCode";
+import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
 
-
-import codesPanel from "./PanelCreateOrderCodes"
-import codeDetailPanel from "./PanelCreateOrderCodeDetail"
-import bizDetailPanel from "./PanelCreateOrderBizDetail"
-import A from "../../plugins/KeyScaner"
-import {findByInvUser} from "@/api/basic/busType";
+import codesPanel from "./PanelCreateOrderCodes";
+import codeDetailPanel from "./PanelCreateOrderCodeDetail";
+import bizDetailPanel from "./PanelCreateOrderBizDetail";
+import A from "../../plugins/KeyScaner";
+import { findByInvUser } from "@/api/basic/busType";
 
 export default {
   name: "ioCreateOrder",
@@ -264,15 +327,14 @@ export default {
       type: Object,
       required: true,
     },
-    viewType: {      //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面
+    viewType: {
+      //1、新增业务单据页面，2.新增扫码单据页面，3、正常单据处理页面
       type: Object,
       required: true,
     },
-
   },
   data() {
     return {
-
       //单据相关
       orderFormData: {
         billNo: null,
@@ -283,10 +345,12 @@ export default {
         fromInvCode: null,
         remark: null,
         fromType: 2,
-        errMsg: null
+        errMsg: null,
+        Acceptance: null,
       },
       errView: 0,
-
+      //选入相关
+      selectorder: false,
       //扫码相关
       codeFormData: {
         code: "",
@@ -316,16 +380,16 @@ export default {
 
       formRules: {
         corpOrderId: [
-          {required: true, message: "请输入单据号", trigger: "blur"}
+          { required: true, message: "请输入单据号", trigger: "blur" },
         ],
         createTime: [
-          {required: true, message: "请选择创建时间", trigger: "blur"}
+          { required: true, message: "请选择创建时间", trigger: "blur" },
         ],
         invCode: [
-          {required: true, message: "请选择当前仓库", trigger: "change"}
+          { required: true, message: "请选择当前仓库", trigger: "change" },
         ],
         action: [
-          {required: true, message: "请选择单据类型", trigger: "change"}
+          { required: true, message: "请选择单据类型", trigger: "change" },
         ],
       },
       isScan: true,
@@ -358,24 +422,34 @@ export default {
     };
   },
   components: {
-    codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog
+    codesPanel,
+    codeDetailPanel,
+    bizDetailPanel,
+    editCodeDialog,
+    DialogCreateOrderSelect,
   },
   methods: {
     //获取用户仓库列表
     findInvListByUser() {
       this.curInvOptions = [];
       findInvByUser()
-        .then(response => {
+        .then((response) => {
           this.curInvOptions = response.data || [];
-          if (this.curInvOptions != null && this.curInvOptions.length > 0 && this.orderFormData.invWarehouseCode == null) {
+          if (
+            this.curInvOptions != null &&
+            this.curInvOptions.length > 0 &&
+            this.orderFormData.invWarehouseCode == null
+          ) {
             this.orderFormData.invWarehouseCode = this.curInvOptions[0].code;
-            this.getBusTypeByInv()
+            this.getBusTypeByInv();
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
+    },
+     //接收预选单传值
+     giveselectbox(val){
+         this.orderFormData.Acceptance=val
     },
-
     //仓库改变
     changeInv() {
       this.orderFormData.action = null;
@@ -391,8 +465,11 @@ export default {
         .then((response) => {
           this.busTypeOptions = response.data || [];
         })
-        .catch(() => {
-        });
+        .catch(() => {});
+    },
+    //关闭预选单弹框
+    closeDialogtwo() {
+      this.selectorder = false;
     },
 
     initBusType() {
@@ -403,16 +480,24 @@ export default {
         .then((response) => {
           this.busTypeOptions = response.data || [];
           this.curAction = this.getActionItem(this.orderFormData.action);
-          if ((this.curAction.checkEnable && (this.curAction.checkWebNew || this.curAction.checkUdims || this.curAction.checkCopy
-            || this.curAction.checkPdaEd || this.curAction.checkPdaUn || this.curAction.checkPc || this.curAction.checkWebNew || this.curAction.checkSp || this.curAction.checkChange || this.curAction.checkBalance)) || this.viewType == 1) {
+          if (
+            (this.curAction.checkEnable &&
+              (this.curAction.checkWebNew ||
+                this.curAction.checkUdims ||
+                this.curAction.checkCopy ||
+                this.curAction.checkPdaEd ||
+                this.curAction.checkPdaUn ||
+                this.curAction.checkPc ||
+                this.curAction.checkWebNew ||
+                this.curAction.checkSp ||
+                this.curAction.checkChange ||
+                this.curAction.checkBalance)) ||
+            this.viewType == 1
+          ) {
             this.bizShow = true;
-          } else
-            this.bizShow = false;
+          } else this.bizShow = false;
         })
-        .catch(() => {
-        });
-
-
+        .catch(() => {});
     },
 
     //获取往来单位候选列表
@@ -423,12 +508,13 @@ export default {
         corpType: null,
         outType: null,
         page: 1,
-        limit: 20
+        limit: 20,
       };
-      if (this.curAction.corpType == 3) {//内部科室
+      if (this.curAction.corpType == 3) {
+        //内部科室
         cQuery.corpType = 3;
-      } else if (this.curAction.corpType == 2)//供应商信息
-      {
+      } else if (this.curAction.corpType == 2) {
+        //供应商信息
         cQuery.corpType = 2;
       } else if (this.curAction.corpType == 0) {
         cQuery.corpType = 2;
@@ -446,16 +532,21 @@ export default {
     //单据类型改变
     actionChange(item) {
       this.curAction = this.getActionItem(item);
-      if ((this.curAction.checkEnable && this.curAction.checkWebNew) || this.viewType == 1) {
+      if (
+        (this.curAction.checkEnable && this.curAction.checkWebNew) ||
+        this.viewType == 1
+      ) {
         //单据类型需要一次校验 或 单据类型为1，显示业务单据页面
         this.bizShow = true;
-      } else
-        this.bizShow = false;
-      if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
+      } else this.bizShow = false;
+      if (
+        this.curAction.corpType == 0 ||
+        this.curAction.corpType == 2 ||
+        (this.curAction.corpType == 1 && !this.curAction.genUnit)
+      ) {
         //1.切换往来单位
-          this.orderFormData.fromCorp = null;
-          this.findMethod();
-
+        this.orderFormData.fromCorp = null;
+        this.findMethod();
       } else if (this.curAction.corpType == 3) {
         //2. 切换往来仓库
         this.orderFormData.fromInvCode = null;
@@ -475,8 +566,7 @@ export default {
             this.orderFormData.fromInvCode = this.fromInvOptions[0].code;
           }
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     //获取当前单据类型
@@ -507,12 +597,16 @@ export default {
       }
       if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
-        this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+        this.orderFormData.corpOrderId =
+          parseTime(date, "{y}{m}{d}{h}{i}{s}") +
+          Math.ceil(Math.random() * 89 + 10);
       }
       this.codeFormData.code = this.codeFormData.code.trim();
       if (this.$isBlank(this.codeFormData.code)) return;
       this.loading = true;
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+      let tQuery = Object.assign(
+        JSON.parse(JSON.stringify(this.orderFormData))
+      );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
       this.addCodeSubmit(tQuery);
@@ -520,7 +614,9 @@ export default {
     },
 
     repeatAddCode(editData) {
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+      let tQuery = Object.assign(
+        JSON.parse(JSON.stringify(this.orderFormData))
+      );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
 
@@ -531,22 +627,19 @@ export default {
 
       this.closeCodeDialog();
       this.addCodeSubmit(tQuery);
-
     },
 
-
     //添加条码后提交
     addCodeSubmit(tQuery) {
       addOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId;
           if (response.data.errMsg != null) {
-            this.$alert(response.data.errMsg, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
+            this.$alert(response.data.errMsg, "提示", {
+              confirmButtonText: "确定",
+              type: "warning",
               closeOnClickModal: true,
-              callback: action => {
-              }
+              callback: (action) => {},
             });
           }
           this.corpOrderIdDisabled = true;
@@ -571,23 +664,23 @@ export default {
               confirmButtonText: "确定",
               cancelButtonText: "忽略",
               type: "error",
-            }).then(() => {
-              tQuery.ignoreExpire = true;
-              this.addCodeSubmit(tQuery)
-            }).catch(() => {
-
-            });
+            })
+              .then(() => {
+                tQuery.ignoreExpire = true;
+                this.addCodeSubmit(tQuery);
+              })
+              .catch(() => {});
           } else if (response.code == 505) {
             this.$confirm(response.message, "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "忽略",
               type: "warning",
-            }).then(() => {
-              tQuery.ignoreRecentExpire = true;
-              this.addCodeSubmit(tQuery)
-            }).catch(() => {
-
-            });
+            })
+              .then(() => {
+                tQuery.ignoreRecentExpire = true;
+                this.addCodeSubmit(tQuery);
+              })
+              .catch(() => {});
           } else if (response.code == 507) {
             this.editOriginCodeVisible = true;
             this.editTitle = response.message;
@@ -596,19 +689,19 @@ export default {
             this.codeFormData.batchNo = response.data.batchNo;
             this.codeFormData.serialNo = response.data.serialNo;
             this.$message({
-              type: 'error',
+              type: "error",
               message: "提交失败！" + this.editTitle,
-              customClass: 'messageIndex'
+              customClass: "messageIndex",
             });
           } else {
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+              type: "warning",
               closeOnClickModal: true,
-              callback: action => {
+              callback: (action) => {
                 this.$refs.inputRef.focus();
                 this.$refs.inputRef.select();
-              }
+              },
             });
           }
         }
@@ -620,55 +713,55 @@ export default {
       this.isCodeAlive = false;
       this.isBizDetailAlive = false;
       this.isCodeDetailAlive = false;
-      this.$nextTick(() => {  //重新加载组件
-        this.isCodeAlive = true
+      this.$nextTick(() => {
+        //重新加载组件
+        this.isCodeAlive = true;
         this.isBizDetailAlive = true;
         this.isCodeDetailAlive = true;
-      })
+      });
     },
 
-
     refreshOrder(orderQuery) {
       this.orderFormData = orderQuery;
     },
 
-
     submit() {
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+      let tQuery = Object.assign(
+        JSON.parse(JSON.stringify(this.orderFormData))
+      );
       tQuery.orderId = this.orderFormData.billNo;
       if (this.viewType == 2) {
-        submitCodes(tQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.$message.success("提交成功,等待处理，请刷新后查看！");
-              this.closeDialog();
-            } else {
-              this.$message.error(response.message);
-            }
-          });
+        submitCodes(tQuery).then((response) => {
+          if (response.code === 20000) {
+            this.$message.success("提交成功,等待处理，请刷新后查看！");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        });
       } else if (this.viewType == 1) {
-        submitBiz(tQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.$message.success("提交成功");
-              this.closeDialog();
-            } else {
-              this.$message.error(response.message);
-            }
-          });
+        submitBiz(tQuery).then((response) => {
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        });
       } else
-        submitOrderWeb(tQuery)
-          .then((response) => {
-            if (response.code === 20000) {
-              this.$message.success("提交成功");
-              this.closeDialog();
-            } else {
-              this.$message.error(response.message);
-            }
-          });
+        submitOrderWeb(tQuery).then((response) => {
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        });
     },
     saveOrder() {
-      let tQuery = Object.assign(JSON.parse(JSON.stringify(this.orderFormData)));
+      let tQuery = Object.assign(
+        JSON.parse(JSON.stringify(this.orderFormData))
+      );
       tQuery.billNo = this.orderFormData.billNo;
       if (this.orderFormData.billNo == null) {
         this.$message.error("请先录入单据信息！");
@@ -684,7 +777,6 @@ export default {
       });
     },
 
-
     // 刷新表单
     resetForm() {
       if (this.$refs["dataForm"]) {
@@ -699,7 +791,7 @@ export default {
       let tQuery = {
         originCode: this.originCode,
         code: this.codeFormData.code.trim(),
-      }
+      };
       enterCodeWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.$refs.inputRef.focus();
@@ -727,20 +819,19 @@ export default {
               .catch(() => {
                 this.codeFormData.code = this.originCode;
               });
-
           } else if (response.code == 508) {
             this.originCode = "";
             this.codeFormData.code = "01" + response.data.nameCode;
             this.originCode = this.codeFormData.code;
           } else {
-            this.$alert(response.message, '提示', {
-              confirmButtonText: '确定',
-              type: 'warning',
+            this.$alert(response.message, "提示", {
+              confirmButtonText: "确定",
+              type: "warning",
               closeOnClickModal: true,
-              callback: action => {
+              callback: (action) => {
                 this.$refs.inputRef.focus();
                 this.$refs.inputRef.select();
-              }
+              },
             });
           }
         }
@@ -748,7 +839,6 @@ export default {
       });
     },
 
-
     getInputFocus(event) {
       event.currentTarget.select();
     },
@@ -773,22 +863,26 @@ export default {
         id: this.curRow.id,
         supId: row.erpId,
       };
-      updateCodeBindSup(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success("绑定成功");
-          this.orderFormData.id = this.curRow.orderId;
-          this.getCodeList();
-        } else {
-          this.$message.error(response.message);
-        }
-      }).catch(() => {
-
-      });
+      updateCodeBindSup(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message.success("绑定成功");
+            this.orderFormData.id = this.curRow.orderId;
+            this.getCodeList();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {});
     },
     closeCodeDialog() {
       this.editOriginCodeVisible = false;
       this.refreshCodesPanel();
     },
+    //选入相关
+    OptionalDocument() {
+      this.selectorder = true;
+    },
   },
   filters: {},
   mounted() {
@@ -798,7 +892,7 @@ export default {
     };
     var that = this;
     var inputer = document.getElementById("inputer");
-    window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+    window.sc = new A.KeyScaner(inputer); //传入要监听的DOM节点
     sc.onInput = function (text) {
       if (text.includes("delete")) {
         that.codeFormData.code = "";
@@ -812,19 +906,18 @@ export default {
         that.sictomText = that.sictomText + str;
         that.codeFormData.code = that.sictomText;
       } else {
-
         that.codeFormData.code = text;
       }
     };
     inputer.focus();
   },
   created() {
-
     //页面初始化
-    this.codeFormData.code = '';
-
+    this.codeFormData.code = "";
+    this.giveselectbox()
     //页面类型
-    if (this.viewType == 2) {//2.新增扫码单据页面，1、新增业务单据页面，3、正常页面
+    if (this.viewType == 2) {
+      //2.新增扫码单据页面，1、新增业务单据页面，3、正常页面
       this.viewCodeVisible = true;
       this.viewCodeDetailVisible = true;
     } else if (this.viewType == 1) {
@@ -835,7 +928,8 @@ export default {
       this.viewBizVisible = true;
     }
     this.orderFormData.orderType = this.viewType;
-    if (this.$isNotBlank(this.orderQuery.billNo)) {   //编辑页面
+    if (this.$isNotBlank(this.orderQuery.billNo)) {
+      //编辑页面
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
@@ -845,25 +939,27 @@ export default {
       this.initBusType();
       this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
-    } else {                                            //新增页面
+    } else {
+      //新增页面
       this.corpOrderIdDisabled = false;
       let date = new Date();
-      this.orderFormData.createTime = parseTime(date, '{y}-{m}-{d} {h}:{i}:{s}');
-      this.orderFormData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
+      this.orderFormData.createTime = parseTime(
+        date,
+        "{y}-{m}-{d} {h}:{i}:{s}"
+      );
+      this.orderFormData.corpOrderId =
+        parseTime(date, "{y}{m}{d}{h}{i}{s}") +
+        Math.ceil(Math.random() * 89 + 10);
       this.orderFormData.deptCode = this.$store.getters.deptCode;
       this.orderFormData.invCode = this.$store.getters.locInvCode;
       this.findInvListByUser();
     }
-  }
-  ,
-}
-;
+  },
+};
 </script>
 
 
 <style>
-
-
 #inputer {
   width: 100%;
   min-height: 30px;
@@ -872,18 +968,16 @@ export default {
   border-style: solid;
   border-width: 0.1px;
   color: #4a4a4a;
-
 }
 
 #inputer:focus {
   width: 100%;
   min-height: 30px;
   background-color: white;
-  border: #0080FF;
+  border: #0080ff;
   border-style: solid;
   border-width: 0.1px;
   color: #4a4a4a;
-
 }
 
 .ime-disabled {
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
new file mode 100644
index 00000000..ce28b099
--- /dev/null
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -0,0 +1,732 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <el-form
+        :model="filterQuery"
+        class="query-form"
+        size="mini"
+        label-width="100px"
+        v-show="showSearch"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单号:">
+              <el-input
+                v-model="filterQuery.billNo"
+                placeholder="请输入单号"
+                style="width: 90%"
+                clearable="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="出入库类型:">
+              <el-select
+                v-model="filterQuery.mainAction"
+                placeholder="请选择出入库类型"
+                style="width: 90%"
+              >
+                <el-option label="全部" value=""></el-option>
+                <el-option label="入库" value="WareHouseIn"></el-option>
+                <el-option label="出库" value="WareHouseOut"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="单据类型:">
+              <el-select
+                v-model="filterQuery.action"
+                placeholder="请选择单据类型"
+                style="width: 90%"
+                clearable
+              >
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select
+                v-model="filterQuery.invCode"
+                placeholder="请选择所属仓库"
+                clearable="true"
+                style="width: 90%"
+                @change="invChange"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="创建时间:">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch"
+            >显示/隐藏搜索栏</el-button
+          >
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset"
+            >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+            >查询
+          </el-button>
+          <el-button
+            type="primary"
+            size="mini"
+            icon="el-icon-bottom-right"
+            @click="combine"
+            :loading="combineLoading"
+            @close="closeLocalDialog"
+            >选入</el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table
+        ref="multipleTable"
+        @select="select"
+        v-loading="loading"
+        :data="list"
+        style="width: 100%"
+        highlight-current-row
+        border
+        @row-click="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="扫码单据类型"
+          prop="billTypeName"
+        ></el-table-column>
+        <el-table-column
+          label="订单号"
+          prop="billNo"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="来源订单号"
+          prop="corpOrderId"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column label="来源" prop="fromType">
+          <template slot-scope="scope">
+            <span>{{ fromTypeMap[scope.row.fromType] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="往来单位" prop="fromName" width="220">
+        </el-table-column>
+        <el-table-column label="当前部门" prop="deptName" width="120">
+        </el-table-column>
+        <el-table-column label="当前仓库" prop="invName" width="120">
+        </el-table-column>
+        <el-table-column
+          label="所属科室"
+          prop="deptName"
+          width="120"
+          v-if="enableDept"
+        >
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          prop="createTime"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <i class="el-icon-time"></i>
+            <span>{{ scope.row.createTime }}</span>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="校验状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
+        <!--                checkStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="操作" width="150" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="printOrder(scope.row)"
+              >打印
+            </el-button>
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="rollback(scope.row)"
+              >撤回
+            </el-button>
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row)"
+              >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  deleteInvByBillNo,
+  getOrderFilter,
+  rollbackOrder,
+} from "../../api/inout/order";
+import { getLocalJoinByUser } from "@/api/basic/busType";
+import { getInvListByUser } from "@/api/system/invWarehouse";
+import { isBlank } from "@/utils/strUtil";
+import { selectSysParamByKey } from "@/api/param/systemParamConfig";
+import { getResultDetailList } from "@/api/inout/orderDetailResult";
+import { getCodeDetailList } from "@/api/inout/orderDetailCode";
+import { getCodeList } from "@/api/inout/code";
+import {
+  inspectionOrderPDFFromTemplateFile,
+  orderPDFFromTemplateFile,
+} from "@/api/itextpdf/orderPrint";
+
+const formJson = {
+  site_id: "",
+  site_name: "",
+  describe: "",
+  ads: [],
+};
+
+export default {
+  name: "IoAuditedOrder",
+  props: {
+        closeDialogtwo: {
+            type: Function,
+            required: true,
+        },
+
+    },
+  data() {
+    return {
+      showSearch: true,
+      filterQuery: {
+        id: "",
+        billNo: null,
+        statusType: "audited",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+      },
+      invList: [],
+      list: [],
+      total: 0,
+      loading: false,
+      index: null,
+      enableDept: false,
+      fromTypeMap: {
+        1: "UDIMS平台",
+        2: "网页新增",
+        3: "pda即时校验",
+        4: "pda未校验",
+        5: "pc端扫码精灵",
+        6: "流转自动补单",
+        7: "UDI供应商平台",
+        8: "平衡补录单据",
+        10: "手动补单",
+        11: "仓库盘点",
+        12: "采购计划",
+        13: "领用单据",
+        14: "第三方系统单据",
+      },
+      deleteData: {
+        id: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      dialogVisible: false,
+      formData: formJson,
+      deleteLoading: false,
+      busTypes: [],
+      currentRow: {},
+      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 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      bizQuery: {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10,
+      },
+      bizTotal: 0,
+      bizDetailLoading: false,
+      bizDetailList: [],
+      codeQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10,
+      },
+      codeTotal: 0,
+      codeDetailLoading: false,
+      codeDetailList: [],
+      resultQuery: {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10,
+      },
+      resultTotal: 0,
+      resultDetailLoading: false,
+      resultDetailList: [],
+      selectboxs:[],
+      selectbox:"",
+    };
+  },
+  components: {},
+  methods: {
+    //重置
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        statusType: "audited",
+        mainAction: null,
+        action: null,
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.getList();
+    },
+    //查询
+    onSubmit() {
+      this.loading = true;
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    //选入
+     combine() {
+         this.closeDialogtwo()
+        this.$emit("giveselectbox", this.selectbox);
+      },
+      //选择
+      select(selection,row){
+          
+        //   console.log(row);
+        this.selectboxs.push(row)
+        let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
+         let qwe = nerArr.map(item=>{
+      // 每一项的单号
+      return item.billNo
+    })
+        this.selectbox=qwe
+      },
+    //关闭对话框
+    closeLocalDialog(){
+           
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType() {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+        })
+        .catch(() => {});
+    },
+    handleSelectionChange(val) {
+      this.currentRow = val;
+      console.log(this.currentRow);
+      this.getOrderDetails();
+    },
+    // 获取单据 业务详情、扫码详情、扫码明细
+    getOrderDetails() {
+      this.bizQuery.page = 1;
+      this.codeQuery.page = 1;
+      this.resultQuery.page = 1;
+
+      this.getBizDetailList();
+      this.getCodeDetailList();
+      this.getResultDetailList();
+    },
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      this.currentRow = { billNo: "" };
+      getOrderFilter(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data.billNo;
+      deleteInvByBillNo(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          }
+        })
+        .catch(() => {});
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteOrders(row);
+        })
+        .catch(() => {});
+    },
+    invChange() {
+      this.filterQuery.action = null;
+      this.getBusType();
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+        })
+        .catch(() => {});
+    },
+    checkOrder(orderId) {},
+    onBizReset() {
+      this.bizQuery = {
+        productName: null,
+        orderIdFk: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getBizDetailList();
+    },
+    onBizSubmit() {
+      this.bizQuery.page = 1;
+      this.getBizDetailList();
+    },
+    getBizDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！");
+        return;
+      }
+      this.bizDetailLoading = true;
+      this.bizQuery.orderIdFk = this.currentRow.billNo;
+      getResultDetailList(this.bizQuery)
+        .then((res) => {
+          this.bizDetailLoading = false;
+          if (res.code === 20000) {
+            this.bizDetailList = res.data.list || [];
+            this.bizTotal = res.data.total || 0;
+          } else {
+            this.$message.error(res.message);
+            this.bizDetailList = [];
+            this.bizTotal = 0;
+          }
+        })
+        .catch((error) => {
+          this.bizDetailLoading = false;
+          this.$message.error(error.message);
+          this.bizDetailList = [];
+          this.bizTotal = 0;
+        });
+    },
+    editBizDialog(row) {},
+    onCodeReset() {
+      this.codeQuery = {
+        orderIdFk: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getCodeDetailList();
+    },
+    onCodeSubmit() {
+      this.codeQuery.page = 1;
+      this.getCodeDetailList();
+    },
+    getCodeDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！");
+        return;
+      }
+
+      this.codeQuery.orderIdFk = this.currentRow.billNo;
+      this.codeDetailLoading = true;
+      getCodeDetailList(this.codeQuery)
+        .then((res) => {
+          this.codeDetailLoading = false;
+          if (res.code === 20000) {
+            this.codeDetailList = res.data.list || [];
+            this.codeTotal = res.data.total || 0;
+          } else {
+            this.$message.error(res.message);
+            this.codeDetailList = [];
+            this.codeTotal = 0;
+          }
+        })
+        .catch((error) => {
+          this.codeDetailLoading = true;
+          this.$message.error(error.message);
+          this.codeDetailList = [];
+          this.codeTotal = 0;
+        });
+    },
+    editCodeDialog(row) {},
+    printOrder(row) {
+      let tQuery = {
+        action: row.action,
+        moduleId: 1,
+      };
+      this.loading = true;
+      inspectionOrderPDFFromTemplateFile(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            tQuery = {
+              templateId: response.data,
+              orderIdFk: row.billNo,
+              action: row.action,
+              moduleId: 1,
+            };
+            orderPDFFromTemplateFile(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;
+        });
+    },
+    onResultReset() {
+      this.resultQuery = {
+        orderId: null,
+        code: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getResultDetailList();
+    },
+    onResultSubmit() {
+      this.resultQuery.page = 1;
+      this.getResultDetailList();
+    },
+    getResultDetailList() {
+      if (isBlank(this.currentRow.billNo)) {
+        this.$message.error("请先选择需要查询的单据！");
+        return;
+      }
+
+      this.resultQuery.orderId = this.currentRow.billNo;
+      this.resultDetailLoading = true;
+      getCodeList(this.resultQuery)
+        .then((res) => {
+          this.resultDetailLoading = false;
+          if (res.code === 20000) {
+            this.resultDetailList = res.data.list || [];
+            this.resultTotal = res.data.total || 0;
+          } else {
+            this.$message.error(res.message);
+            this.resultDetailList = [];
+            this.resultTotal = 0;
+          }
+        })
+        .catch((error) => {
+          this.resultDetailLoading = false;
+          this.$message.error(error.message);
+          this.resultDetailList = [];
+          this.resultTotal = 0;
+        });
+    },
+    //单据撤回
+    rollback(row) {
+      this.$confirm(
+        "此操作将撤回单据至已校验未审核状态并删除对应库存信息, 是否继续?",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          let param = { billNo: row.billNo };
+          rollbackOrder(param).then((res) => {
+            if (res.code === 20000) {
+              this.$message.success("撤回成功");
+              this.getList();
+            } else {
+              this.$message.error(res.message);
+            }
+          });
+        })
+        .catch(() => {
+          // this.$message.info('回退失败');
+        });
+    },
+  },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        false: "success",
+        true: "warning",
+      };
+      return statusMap[status];
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList();
+    this.getBusType();
+    selectSysParamByKey({ paramKey: "muti_inv_mode" }).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    });
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/vue.config.js b/vue.config.js
index 5b064d38..2a85f322 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:9991/`,
+        target: `http://192.168.0.166:9991/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

From abf0ad2dda0aca5e6974bb8a3cd7bb8d36df7645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Tue, 18 Apr 2023 18:01:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  14 +-
 src/api/inout/acceptOrder.js                  |   7 +
 src/api/inout/order.js                        |   3 +
 src/api/inout/statData.js                     |  10 +
 src/api/system/invRemindSet.js                |  16 +
 src/api/system/systemPDFTemplate.js           |  62 +-
 src/views/inout/DialogNewReviewOrder.vue      | 507 ++++++++++
 src/views/inout/IoCheckAuditOrder.vue         |  30 +-
 src/views/inout/receive/DialogNewReceive.vue  |  64 +-
 src/views/inout/stat/IoStatDaySearch.vue      |  24 +-
 src/views/inout/stat/IoStatMonthSearch.vue    |  24 +-
 src/views/inout/stat/IoStatQuarterSearch.vue  |  22 +-
 src/views/inout/stat/IoStatYearSearch.vue     |  22 +-
 src/views/inventory/InvProducts.vue           |  40 +-
 src/views/inventory/addInvRemindSetDialog.vue | 212 ++++
 .../purchase/purApply/purApplyEditDiaolog.vue | 953 +++++++++---------
 .../purchase/purOrder/purOrderEditDialog.vue  |   6 +-
 .../purchase/purPlan/purPlanEditDialog.vue    |   6 +-
 src/views/remind/addInvRemindSetDialog.vue    | 335 ++++++
 src/views/remind/invRemindSet.vue             | 174 ++--
 src/views/remind/invRemindSetModify.vue       | 105 +-
 src/views/sync/SysUdimsConfig.vue             | 764 ++++++++++----
 src/views/system/print/pdfBizPrintSet.vue     | 759 ++++++++++++++
 src/views/system/print/pdfCodePrintSet.vue    | 759 ++++++++++++++
 src/views/system/print/pdfLabelPrintSet.vue   | 758 ++++++++++++++
 src/views/system/print/pdfPrintSet.vue        | 836 +--------------
 .../system/print/pdfStatementPrintSet.vue     | 758 ++++++++++++++
 src/views/system/print/pdfTmpleateManage.vue  |  54 +-
 vue.config.js                                 | 161 ++-
 29 files changed, 5715 insertions(+), 1770 deletions(-)
 create mode 100644 src/views/inout/DialogNewReviewOrder.vue
 create mode 100644 src/views/inventory/addInvRemindSetDialog.vue
 create mode 100644 src/views/remind/addInvRemindSetDialog.vue
 create mode 100644 src/views/system/print/pdfBizPrintSet.vue
 create mode 100644 src/views/system/print/pdfCodePrintSet.vue
 create mode 100644 src/views/system/print/pdfLabelPrintSet.vue
 create mode 100644 src/views/system/print/pdfStatementPrintSet.vue

diff --git a/.env.production b/.env.production
index f0e1c16d..85178235 100644
--- a/.env.production
+++ b/.env.production
@@ -6,11 +6,19 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
 
 
-#林纪裕
-VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
+#林纪裕cd
+# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_WMS_MC/'
 
 
-# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_WMS_MC/'
+# 测试服务器
+# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
+
+
+# 吴总测试服务器
+# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'
diff --git a/src/api/inout/acceptOrder.js b/src/api/inout/acceptOrder.js
index 750d0416..191a30ab 100644
--- a/src/api/inout/acceptOrder.js
+++ b/src/api/inout/acceptOrder.js
@@ -35,3 +35,10 @@ export function getAcceptStatus(query) {
   });
 }
 
+export function reviewSpms(query) {
+  return axios({
+    url: "/udiwms/order/reviewSpms",
+    method: "post",
+    data: query
+  });
+}
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 25cce1da..59da4dc4 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -511,3 +511,6 @@ export function orderChange(query) {
 }
 
 
+
+
+
diff --git a/src/api/inout/statData.js b/src/api/inout/statData.js
index b12cf6c4..5506cfa0 100644
--- a/src/api/inout/statData.js
+++ b/src/api/inout/statData.js
@@ -39,3 +39,13 @@ export function filterYearList(params) {
     params: params
   });
 }
+
+  export function excelImport(params) {
+    return axios({
+      url: "/udiwms/inv/excelExportOut",
+      method: "get",
+      responseType: 'blob',
+      params: params
+    });
+  }
+
diff --git a/src/api/system/invRemindSet.js b/src/api/system/invRemindSet.js
index 47659f93..6ff6bc2c 100644
--- a/src/api/system/invRemindSet.js
+++ b/src/api/system/invRemindSet.js
@@ -23,3 +23,19 @@ export function deleteInvRemindSet(data){
     data: data
   });
 }
+
+export function getInfoByInvId(params) {
+  return axios({
+    url: "/udiwms/inv/remind/set/getInfoByInvId",
+    method: "get",
+    params: params
+  });
+}
+
+export function batchAddInvRemindSet(data) {
+  return axios({
+    url: "/udiwms/inv/remind/set/batchAddInvRemindSet",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/system/systemPDFTemplate.js b/src/api/system/systemPDFTemplate.js
index 2a2325ae..f4eca062 100644
--- a/src/api/system/systemPDFTemplate.js
+++ b/src/api/system/systemPDFTemplate.js
@@ -59,18 +59,70 @@ export function systemPDFTemplateDeleteById(query) {
   });
 }
 
-export function moduleDetail(query) {
+export function moduleBizDetail(query) {
   return axios({
-    url: "/system/pdf/module/detail",
-    method: "get",
-    params: query
+    url: "/system/pdf/templateRelevanceBiz/getListByModelId",
+    method: "post",
+    data: query
   });
 }
 
 
 export function updateDetailRel(query) {
   return axios({
-    url: "/system/pdf/module/updateRl",
+    url: "/system/pdf/templateRelevanceBiz/updateRl",
+    method: "post",
+    data: query
+  });
+}
+
+export function moduleCodeDetail(query) {
+  return axios({
+    url: "/system/pdf/templateRelevanceCode/getListByModelId",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function updateCodeDetailRel(query) {
+  return axios({
+    url: "/system/pdf/templateRelevanceCode/updateRl",
+    method: "post",
+    data: query
+  });
+}
+
+export function moduleLabelDetail(query) {
+  return axios({
+    url: "/system/pdf/templateRelevanceLabel/getListByModelId",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function updateLabelDetailRel(query) {
+  return axios({
+    url: "/system/pdf/templateRelevanceLabel/updateRl",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function moduleStatementDetail(query) {
+  return axios({
+    url: "/system/pdf/templateRelevanceStatement/getListByModelId",
+    method: "post",
+    data: query
+  });
+}
+
+
+export function updateStatementDetailRel(query) {
+  return axios({
+    url: "/system/pdf/templateRelevanceStatement/updateRl",
     method: "post",
     data: query
   });
diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
new file mode 100644
index 00000000..2a1f0cc0
--- /dev/null
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -0,0 +1,507 @@
+<template>
+  <div>
+    <el-card style="margin-top: -20px">
+      <el-form :model="formData" ref="dataForm" label-width="100px">
+        <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
+          <el-button
+            type="primary"
+            @click.native="checkFinish()"
+          >完成审核
+          </el-button
+          >
+          <el-button
+            type="primary"
+            @click.native="renewAccept()"
+          >重新审核
+          </el-button
+          >
+        </el-button-group>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item prop="fromCorp" label="单据编号:">
+              <el-input v-model="formData.billNo" auto-complete="off"
+                        @keypress.enter.native="orderEnterKey($event)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button-group style="margin-left: 15px">
+              <el-button
+                type="primary"
+                @click.native="searchOrder()"
+              >查询
+              </el-button
+              >
+              <el-button
+                type="primary"
+                @click.native="refreshOrder()"
+              >重置
+              </el-button
+              >
+
+            </el-button-group>
+
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="单据时间:">
+              <el-input v-model="formData.createTime" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="单据类型:">
+              <el-input v-model="formData.billTypeName" auto-complete="off"
+                        disabled
+                        clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="收货仓库:">
+              <el-input v-model="formData.invName" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item prop="fromCorp" label="送货单位:">
+              <el-input v-model="formData.fromCorpName" auto-complete="off"
+                        disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20">
+            <el-form-item prop="code" label="扫码校验:">
+              <el-input
+                id="inputer"
+                placeholder="请输入UDI码"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref='inputRef'
+                style="ime-mode:disabled"
+                type="tel"
+                v-model="udiCode"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button
+              type="primary"
+              size="small"
+              @click.native.stop="addCode()"
+              style="height: 31px; margin-left: 20px"
+            >添加
+            </el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="detailLoading"
+                :data="detailList"
+                border
+                :row-style="rowStyle"
+                :cell-style="{padding:6+'px'}"
+                style="width: 100%">
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" width="160" prop="coName"></el-table-column>
+        <el-table-column label="规格型号" width="160" prop="spec"></el-table-column>
+        <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
+        <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
+        <el-table-column label="审核数量" width="100" prop="acceptCount"></el-table-column>
+        <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
+        <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
+        <el-table-column label="价格" width="120" prop="price"></el-table-column>
+        <el-table-column width="100" label="计量单位" prop="measname">
+        </el-table-column>
+        <el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
+
+        <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
+        </el-table-column>
+        <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo">
+        </el-table-column>
+        <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo">
+        </el-table-column>
+        <el-table-column label="发票日期" width="150" prop="invoiceDate">
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+
+</template>
+
+<script>
+import A from "../../plugins/KeyScaner"
+import {updateStatus, enterCodeWeb, thirdUpdateStatus} from "@/api/inout/order";
+import {getAcceptOrder, acceptClear, acceptAddCode, getAcceptStatus, reviewSpms} from "@/api/inout/acceptOrder";
+
+
+export default {
+  name: "acceptOrder",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    orderQuery: {
+      type: Object,
+      required: true,
+    },
+    reviewType: {
+      type: Object,
+      required: true,
+    }
+
+  },
+  data() {
+    return {
+      formData: {},
+      loading: false,
+      detailLoading: false,
+      udiCode: null,
+      sictomText: "",
+      originCode: "",
+      checkSuccess: false,
+      detailList: [],
+      query: {
+        code: "",
+        corpOrderId: "",
+        page: 1,
+        limit: 10,
+      },
+    }
+  },
+
+  components: {},
+
+  methods: {
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.reCount != row.acceptCount) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+
+
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getCodeList();
+    },
+
+
+    enterKey(event) {
+      this.checkSuccess = true;
+      let tQuery = {
+        originCode: this.originCode,
+        code: this.udiCode.trim(),
+      }
+      enterCodeWeb(tQuery).then((response) => {
+        if (response.code === 20000) {
+          this.$refs.inputRef.focus();
+          this.$refs.inputRef.select();
+          this.udiCode = response.data;
+          this.addCode();
+        } else {
+          if (response.code == 502) {
+            this.checkSuccess = false;
+            this.udiCode = response.data;
+            this.originCode = this.udiCode;
+          } else if (response.code == 501) {
+            this.checkSuccess = false;
+            this.$message.error(response.message);
+          } else if (response.code == 503) {
+            this.checkSuccess = false;
+            this.udiCode = response.data;
+            this.$confirm(response.message, "提示", {
+              type: "warning",
+            })
+              .then(() => {
+                this.udiCode = response.data;
+                this.addCode();
+              })
+              .catch(() => {
+                this.udiCode = this.originCode;
+              });
+
+          } else if (response.code == 508) {
+            this.originCode = "";
+            this.udiCode = "01" + response.data.nameCode;
+            this.originCode = this.udiCode;
+          } else {
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
+              closeOnClickModal: true,
+              callback: action => {
+                this.$refs.inputRef.focus();
+                this.$refs.inputRef.select();
+              }
+            });
+          }
+        }
+        this.loading = false;
+      });
+    },
+
+    searchOrder() {
+      let query = {
+        billNo: this.formData.billNo
+      };
+      reviewSpms(query)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.orderDetailEntities || [];
+          this.formData = response.data.orderEntity;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+    orderEnterKey() {
+      this.searchOrder();
+    },
+    refreshOrder() {
+      this.formData = {};
+      this.detailList = [];
+    },
+
+
+    addCode() {
+      if (this.$isBlank(this.udiCode)) {
+        this.$message.error("UDI码不能为空！");
+      }
+      let postQuery = {
+        billNo: this.orderQuery.billNo,
+        orderDetailEntities: this.detailList,
+        code: this.udiCode,
+      }
+      acceptAddCode(postQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.detailLoading = false;
+            this.detailList = response.data.orderDetailEntities || [];
+            if (response.data.finishAccept) {
+              this.$confirm("审核结果正确，是否立即完成审核?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              })
+                .then(() => {
+                  this.postAccept();
+                })
+                .catch(() => {
+                });
+            } else {
+              this.$message.success("匹配成功！");
+            }
+
+          } else {
+            this.$message.error(response.message);
+          }
+
+
+        })
+        .catch(() => {
+          this.detailLoading = false;
+        });
+
+
+    },
+
+    getInputFocus(event) {
+      event.currentTarget.select();
+    },
+
+
+    checkFinish() {
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      getAcceptStatus(query)
+        .then((response) => {
+          if (response.code == 20000) {
+            let tip = "审核结果正确，是否立即完成审核?";
+            this.finishAccept(tip);
+          } else {
+            let tip = "审核未完成,是否强制完成审核此单据？";
+            this.finishAccept(tip);
+          }
+        })
+        .catch(() => {
+        });
+
+
+    },
+
+
+    finishAccept(tip) {
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.postAccept();
+
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+
+    },
+    postAccept() {
+      let query = {
+        orderId: this.orderQuery.billNo,
+      };
+      if (this.reviewType != null && this.reviewType == 2) {
+        thirdUpdateStatus(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message.success("核对成功！");
+              this.closeDialog();
+              this.$emit('childByValue', 1)
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
+
+      } else {
+        updateStatus(query)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message.success("审核成功！");
+              this.closeDialog();
+              this.$emit('childByValue', 1)
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
+      }
+    },
+
+    renewAccept() {
+      let query = {
+        billNo: this.orderQuery.billNo,
+      }
+      acceptClear(query)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.orderDetailEntities || [];
+          this.formData = response.data.orderEntity;
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    },
+
+
+    getOrderDetail() {
+      this.detailLoading = true;
+      let query = {
+        billNo: this.orderQuery.billNo,
+      }
+      getAcceptOrder(query)
+        .then((response) => {
+          this.detailLoading = false;
+          this.detailList = response.data.orderDetailEntities || [];
+          if (response.data.exitAccept) {
+            this.$confirm("检测到上一次验收操作未完成, 是否继续上一次验收?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+              })
+              .catch(() => {
+                this.renewAccept();
+              });
+          }
+
+        })
+        .catch(() => {
+          this.detailLoading = false;
+          this.detailList = [];
+        });
+    }
+
+  },
+
+
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    var that = this;
+    var inputer = document.getElementById("inputer");
+    window.sc = new A.KeyScaner(inputer);//传入要监听的DOM节点
+    sc.onInput = function (text) {
+      if (text.includes("delete")) {
+        that.vailQuery.code = "";
+        return;
+      }
+      if (that.sitcomScan) {
+        let tempTxt = text;
+        let str = tempTxt.replace(/[\r]/g, "");
+        that.sictomText = that.sictomText + str;
+        that.vailQuery.code = that.sictomText;
+      } else {
+        that.vailQuery.code = text;
+      }
+    };
+    inputer.focus();
+
+
+  },
+  created() {
+
+    // this.formData = this.orderQuery;
+    // this.getOrderDetail()
+  },
+
+
+}
+</script>
+
+<style scoped>
+
+
+#inputer {
+  width: 100%;
+  min-height: 30px;
+  background-color: white;
+  border: #d0d0d0;
+  border-style: solid;
+  border-width: 0.1px;
+  color: #4a4a4a;
+
+}
+
+#inputer:focus {
+  width: 100%;
+  min-height: 30px;
+  background-color: white;
+  border: #0080FF;
+  border-style: solid;
+  border-width: 0.1px;
+  color: #4a4a4a;
+
+}
+</style>
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 301316f5..00af5928 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -51,7 +51,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="6">
             <el-form-item class="query-form-item" label="创建时间:">
@@ -84,6 +83,10 @@
           >查询
           </el-button
           >
+          <el-button type="primary" icon="el-icon-search" @click="newReview"
+          >新增单据审核
+          </el-button
+          >
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -421,7 +424,7 @@
     </el-tabs>
 
     <el-dialog
-      title="单据验收"
+      title="单据审核"
       :visible.sync="acceptOrderVisible"
       width="80%"
       :close-on-click-modal="false"
@@ -435,6 +438,20 @@
       ></accept-order>
     </el-dialog>
 
+    <el-dialog
+      title="新增单据审核"
+      :visible.sync="newAcceptOrderVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="newAcceptOrderVisible"
+    >
+      <NewAcceptOrder
+        :closeDialog="closeAcceptDialog"
+        v-on:childByValue="parentByFn"
+      ></NewAcceptOrder>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -451,6 +468,7 @@ import {getBizDetailList} from "@/api/inout/orderDetailBiz";
 import {getCodeDetailList} from "@/api/inout/orderDetailCode";
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
+import NewAcceptOrder from "@/views/inout/DialogNewReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 
 
@@ -585,9 +603,10 @@ export default {
       resultDetailList: [],
       acceptQuery: null,
       acceptOrderVisible: false,
+      newAcceptOrderVisible: false,
     };
   },
-  components: {AcceptOrder},
+  components: {AcceptOrder, NewAcceptOrder},
   methods: {
     onReset() {
       this.$router.push({
@@ -907,6 +926,11 @@ export default {
       this.acceptOrderVisible = true;
     },
 
+
+    newReview() {
+      this.newAcceptOrderVisible = true;
+    },
+
     parentByFn: function (childValue) {
       this.getList();
     },
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index 989077c2..f58e005b 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -128,8 +128,12 @@
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="150">
             <template slot-scope="scope">
-              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
-              <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
+                         @click.native="rowChange(scope.row)">编辑
+              </el-button>
+              <el-button type="text" size="small" @click.stop="true"
+                         @click.native="deleteCodeArray(scope.$index, scope.row)">删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -158,7 +162,7 @@
 
 <script>
 import {getBusChange} from "@/api/basic/busTypeChange";
-import {inserThrOrderWeb, updateReceive, updateReceiveDetail,delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
+import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail} from "@/api/thrsys/thrOrderReceive";
 import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import dialogInvProduct from "../DialogSelectInvProduct";
 import {getOrderDetail} from "@/api/inout/receiveOrder";
@@ -195,9 +199,10 @@ export default {
       formData: {
         invCode: null,
         targetInvCode: null,
+
         billNo: null,
         billDate: "",
-        billType: "",
+        billType: "HCLY",
       },
       formRules: {
         billDate: [
@@ -322,7 +327,6 @@ export default {
               }
 
 
-
             }
           }
           if (status === '0') {
@@ -343,7 +347,7 @@ export default {
               type: "warning",
             }).then(() => {
               this.submitFunction(status);
-              this.loading=false
+              this.loading = false
             }).catch(() => {
               this.loading = false;
             });
@@ -361,22 +365,22 @@ export default {
       tQuery.status = status;
       tQuery.subErpOrders = this.codeArray;
       tQuery.thirdPartyDate = 2;
-        updateReceive(tQuery)
-          .then(response => {
-            if (response.code === 20000) {
-              this.$message.success(tMessage + "成功");
-              this.closeDialog(true);
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          })
+      updateReceive(tQuery)
+        .then(response => {
+          if (response.code === 20000) {
+            this.$message.success(tMessage + "成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
     },
     selectProductFunction(event) {
 
-      if(this.formData.targetInvCode==null){
+      if (this.formData.targetInvCode == null) {
         this.$message.error("往来信息为空！");
         return;
       }
@@ -387,7 +391,7 @@ export default {
     },
     closeDialogC2(rData) {
       this.selectInvProductVisible = false;
-      this.formData.billNo=rData;
+      this.formData.billNo = rData;
       this.getOrderDetailList();
 
     },
@@ -400,12 +404,12 @@ export default {
     },
     tableCountChange(row) {
       if (this.$isNotBlank(row)) {
-        updateReceiveDetail(row).then(res=>{
-           if (res.code==20000){
-             this.loading = false;
-           }else{
-             this.$message.error(res.message);
-           }
+        updateReceiveDetail(row).then(res => {
+          if (res.code == 20000) {
+            this.loading = false;
+          } else {
+            this.$message.error(res.message);
+          }
 
         })
       }
@@ -439,7 +443,7 @@ export default {
               .then(response => {
                 this.detailLoading = false;
                 if (response.code === 20000) {
-                     this.getOrderDetailList();
+                  this.getOrderDetailList();
                 } else {
                   this.$message.error(response.message);
                 }
@@ -489,7 +493,7 @@ export default {
   },
   created() {
     if (this.$isNotBlank(this.idQuery.id)) {
-      this.editType=true;
+      this.editType = true;
       this.query.limit = 100;
       this.query.orderIdFk = this.idQuery.id;
       this.formData = this.idQuery.formData;
@@ -498,13 +502,13 @@ export default {
       this.getOrderDetailList();
     } else {
 
-      this.editType=false;
+      this.editType = false;
       this.formData = {
         invCode: this.$store.getters.locInvCode,
         targetInvCode: null,
+        billType: "HCLY",
         billNo: null,
         billDate: "",
-        billType: "",
       };
       this.orderEditor = false;
     }
diff --git a/src/views/inout/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue
index 9119522c..77898f99 100644
--- a/src/views/inout/stat/IoStatDaySearch.vue
+++ b/src/views/inout/stat/IoStatDaySearch.vue
@@ -104,6 +104,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -153,7 +157,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterDayList} from "@/api/inout/statData";
+import {getStatOrderList, filterDayList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -186,6 +191,7 @@ export default {
         page: 1,
         limit: 10
       },
+      key:null,
       detailLoading: false,
       detailList: [],
       detailTotal: 0,
@@ -276,6 +282,22 @@ export default {
       this.detailList = [];
       this.detailTotal = 0;
     },
+
+    excel(){
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"day"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+          this.$message("成功")
+      })
+
+    },
     //获取订单列表
     getList() {
       this.loading = true;
diff --git a/src/views/inout/stat/IoStatMonthSearch.vue b/src/views/inout/stat/IoStatMonthSearch.vue
index 5e993611..fdb74a84 100644
--- a/src/views/inout/stat/IoStatMonthSearch.vue
+++ b/src/views/inout/stat/IoStatMonthSearch.vue
@@ -100,6 +100,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -149,7 +153,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterMonthList} from "@/api/inout/statData";
+import {getStatOrderList, filterMonthList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -256,6 +261,23 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+
+    excel(){
+      debugger
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"month"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
diff --git a/src/views/inout/stat/IoStatQuarterSearch.vue b/src/views/inout/stat/IoStatQuarterSearch.vue
index 7e690c49..1fbdd70b 100644
--- a/src/views/inout/stat/IoStatQuarterSearch.vue
+++ b/src/views/inout/stat/IoStatQuarterSearch.vue
@@ -100,6 +100,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -149,7 +153,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterQuarterList} from "@/api/inout/statData";
+import {getStatOrderList, filterQuarterList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -277,6 +282,21 @@ export default {
       this.detailList = [];
       this.detailTotal = 0;
     },
+    excel(){
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"quarter"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
     //获取订单列表
     getList() {
       this.loading = true;
diff --git a/src/views/inout/stat/IoStatYearSearch.vue b/src/views/inout/stat/IoStatYearSearch.vue
index 6e4af382..6c52e513 100644
--- a/src/views/inout/stat/IoStatYearSearch.vue
+++ b/src/views/inout/stat/IoStatYearSearch.vue
@@ -100,6 +100,10 @@
                          icon="el-icon-search"
               >查询
               </el-button>
+              <el-button type="primary" @click="excel"
+                         icon="el-icon-upload2"
+              >导出
+              </el-button>
             </el-button-group>
           </el-form-item>
         </el-form>
@@ -149,7 +153,8 @@
 </template>
 
 <script>
-import {getStatOrderList, filterYearList} from "@/api/inout/statData";
+import {getStatOrderList, filterYearList, excelImport} from "@/api/inout/statData";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
   site_id: "",
@@ -256,6 +261,21 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+    excel(){
+      if(isBlank(this.currentRow.recordKey)){
+        return this.$message.error("请选择要导出的数据！");
+      }
+      let params={billNo:this.currentRow.recordKey,key:"year"};
+      excelImport(params ).then( res =>{
+        let blob = new Blob([res],{type: "application/vnd.ms-excel"});
+        let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象
+        let a = document.createElement("a");
+        a.href = url;
+        a.click();
+        this.$message("成功")
+      })
+
+    },
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 92ab5360..f61cddbc 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -143,6 +143,13 @@
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="110" fixed="right">
           <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="invRemindSet(scope.row)"
+            >添加预警设置
+            </el-button
+            >
             <el-button
               type="text"
               size="small"
@@ -183,6 +190,20 @@
       ></invProductsDetail>
     </el-dialog>
 
+    <el-dialog
+      title="添加库存预警设置"
+      :visible.sync="addInvRemindSetDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="60%"
+      v-if="addInvRemindSetDialogVisible"
+    >
+      <addInvRemindSetDialog
+        :invId="invId"
+        :closeDialog="closeRemindSetDialog"
+      ></addInvRemindSetDialog>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -192,6 +213,8 @@ import {getInvProduct, deleteInvProduct, getProduct} from "@/api/inventory/invPo
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
 import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
+import addInvRemindSetDialog from "@/views/inventory/addInvRemindSetDialog.vue";
+
 
 export default {
   name: "InvProducts",
@@ -234,7 +257,9 @@ export default {
         supId: null,
         deptCode: null,
         invCode: null
-      }
+      },
+      addInvRemindSetDialogVisible: false,
+      invId: null
     };
   },
   methods: {
@@ -372,10 +397,19 @@ export default {
       }).catch((error) => {
         this.$message.error(error.message);
       });
-    }
+    },
+    invRemindSet(row) {
+      this.invId = row.id;
+      this.addInvRemindSetDialogVisible = true;
+    },
+    closeRemindSetDialog() {
+      this.invId = null;
+      this.addInvRemindSetDialogVisible = false;
+    },
   },
   components: {
-    invProductsDetail
+    invProductsDetail,
+    addInvRemindSetDialog
   },
   mounted() {
     document.body.ondrop = function (event) {
diff --git a/src/views/inventory/addInvRemindSetDialog.vue b/src/views/inventory/addInvRemindSetDialog.vue
new file mode 100644
index 00000000..cd7da558
--- /dev/null
+++ b/src/views/inventory/addInvRemindSetDialog.vue
@@ -0,0 +1,212 @@
+<template>
+  <div>
+    <el-form :model="formData" label-width="200px" style="margin-bottom: -15px">
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="仓库：">
+            <el-input v-model="formData.invName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="货位：">
+            <el-input v-model="formData.invSpaceName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="产品名称：">
+            <el-input v-model="formData.productName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="规格型号：">
+            <el-input v-model="formData.ggxh" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="低库存预警数量：">
+            <el-input v-model="formData.lowStockNum" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="库存积压预警数量：">
+            <el-input v-model="formData.overStockNum" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="近效期预警时间：">
+            <el-input v-model="formData.recentDateTime" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="近效期预警时间单位：">
+            <el-input v-show="formData.isDateBy == 1" value="天" disabled></el-input>
+            <el-input v-show="formData.isDateBy == 2" value="小时" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider></el-divider>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启低库存预警">
+            <el-select v-model="formData.lowStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启负库存预警">
+            <el-select v-model="formData.lackStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启库存积压预警">
+            <el-select v-model="formData.overStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启产品过期预警">
+            <el-select v-model="formData.expireDate">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="是否开启近效期预警">
+            <el-select v-model="formData.recentDate">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click.native="closeDialog">取消</el-button>
+      <el-button type="primary" @click.native="addInvRemindSet()" :loading="formLoading"
+      >提交
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import {getInfoByInvId, saveInvRemindSet} from "@/api/system/invRemindSet";
+
+export default {
+  name: "addInvRemindSetDialog",
+  props: {
+    invId: {
+      type: String,
+      required: true
+    },
+    closeDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  data() {
+    return {
+      formData: {
+        relId: null,
+        ggxh: null,
+        deptCode: null,
+        invCode: null,
+        invSpaceCode: null,
+        lowStock: false,
+        lackStock: false,
+        overStock: false,
+        expireDate: false,
+        recentDate: false,
+        lowStockNum: null,
+        overStockNum: null,
+        recentDateTime: null,
+        isDateBy: null,
+        invName: null,
+        invSpaceName: null,
+        productName: null
+      },
+      formLoading: false
+    };
+  },
+  methods: {
+    getRemindSetInfo() {
+      getInfoByInvId({invId: this.invId}).then((res) => {
+        if (res.code === 20000) {
+          this.formData = res.data;
+          this.formData.lowStock = false;
+          this.formData.lackStock = false;
+          this.formData.overStock = false;
+          this.formData.expireDate = false;
+          this.formData.recentDate = false;
+        } else {
+          this.$message.error(res.meesage);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      })
+    },
+    addInvRemindSet() {
+      if (!this.formData.lowStock && !this.formData.lackStock && !this.formData.overStock && !this.formData.expireDate && !this.formData.recentDate) {
+        this.$message.warning("至少开启一项预警！");
+        return;
+      }
+      saveInvRemindSet(this.formData, "add").then((res) => {
+        if (res.code === 20000) {
+          this.closeDialog();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.closeDialog();
+      })
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getRemindSetInfo();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 79c77019..208d8169 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -1,166 +1,174 @@
 <template>
-    <div>
-        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
-            <el-row type="flex" justify="end">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
-                    <el-button type="primary" @click.native="saveOrder('1')" :loading="loading">草稿保存</el-button>
-                    <el-button type="primary" @click.native="saveOrder('2')" :loading="loading">提交单据</el-button>
-                </el-button-group>
-            </el-row>
+  <div>
+    <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
+      <el-row type="flex" justify="end">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+          <el-button type="primary" @click.native="saveOrder('1')" :loading="loading">草稿保存</el-button>
+          <el-button type="primary" @click.native="saveOrder('2')" :loading="loading">提交单据</el-button>
+        </el-button-group>
+      </el-row>
 
-            <el-card style="margin-top: -5px;">
-                <el-row>
-                    <el-col :span="11">
-                        <el-form-item label="单据号：" prop="billNo" >
-                            <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
+      <el-card style="margin-top: -5px;">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="单据号：" prop="billNo">
+              <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
 
-                    <el-col :span="11">
-                        <el-form-item label="单据日期：" prop="billdate">
-                            <el-date-picker
-                                v-model="formData.billDate"
-                                type="datetime"
-                                placeholder="选择日期"
-                                style="width: 90%"
-                                :clearable="false"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+          <el-col :span="11">
+            <el-form-item label="单据日期：" prop="billdate">
+              <el-date-picker
+                v-model="formData.billDate"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 90%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-              <el-row style="margin-top: -10px">
-                <el-col :span="11">
-                  <el-form-item label="紧急程度：" prop="emergency">
-                    <el-select v-model="formData.emergency"  placeholder="请选择紧急程度" style="width: 90%" 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-form-item>
-                </el-col>
-                <el-col :span="11">
-                    <el-form-item label="到货时间：" prop="arrivalTime">
-                      <el-date-picker
-                        v-model="formData.arrivalTime"
-                        type="datetime"
-                        placeholder="选择日期"
-                        style="width: 90%"
-                        :clearable="false"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                      >
-                      </el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+        <el-row style="margin-top: -10px">
+          <el-col :span="11">
+            <el-form-item label="紧急程度：" prop="emergency">
+              <el-select v-model="formData.emergency" placeholder="请选择紧急程度" style="width: 90%" 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-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="到货时间：" prop="arrivalTime">
+              <el-date-picker
+                v-model="formData.arrivalTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 90%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row style="margin-top: -10px">
-                    <el-col :span="11">
-                        <el-form-item label="申购科室：" prop="locStorageCode">
-                            <el-select v-model="formData.targetInvCode"  placeholder="当前分库信息" @change="setWarehouseName" style="width: 90%" clearable>
-                                <el-option
-                                    v-for="item in subInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="11">
-                        <el-form-item label="申购说明：" prop="billNo">
-                            <el-input v-model="formData.remark" auto-complete="off" style="width: 90%" type="textarea" autosize></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row  style="margin-top: -10px" v-show="formData.status==4">
-                    <el-col :span="11">
-                        <el-form-item label="拒绝原因：">
-                            <el-input v-model="formData.auditRemark" auto-complete="off" style="width: 90%" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row style="margin-top: -10px">
+          <el-col :span="11">
+            <el-form-item label="申购科室：" prop="locStorageCode">
+              <el-select v-model="formData.targetInvCode" placeholder="当前分库信息" @change="setWarehouseName"
+                         style="width: 90%" clearable>
+                <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="申购说明：" prop="billNo">
+              <el-input v-model="formData.remark" auto-complete="off" style="width: 90%" type="textarea"
+                        autosize></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: -10px" v-show="formData.status==4">
+          <el-col :span="11">
+            <el-form-item label="拒绝原因：">
+              <el-input v-model="formData.auditRemark" auto-complete="off" style="width: 90%"
+                        :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-            </el-card>
+      </el-card>
 
-            <el-card>
-              <el-row type="flex" justify="end">
-                <el-button-group style="display: flex">
-                  <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
-                    <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>
-                  </el-button-group>
-                </el-button-group>
-              </el-row>
+      <el-card>
+        <el-row type="flex" justify="end">
+          <el-button-group style="display: flex">
+            <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
+              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入计划单</el-button>
+            </el-button-group>
+          </el-button-group>
+        </el-row>
 
-                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
-                    <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-                    <el-table-column width="150" label="申购数量">
-                        <template slot-scope="scope">
-                            <el-input size="small" v-model="scope.row.count"
-                                      placeholder="请输入数量" style="width: 80%"
-                                      type='number'
-                                      @change="tableCountChange(scope.row)"
-                                      :disabled="scope.row.index !== selectedIndex"
-                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="操作"  width="120">
-                        <template slot-scope="scope">
-                            <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
-                            <el-button type="text" size="small" @click.stop="true" @click.native="deleteCodeArray(scope.$index, scope.row)">删除</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-card>
-        </el-form>
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
+                  highlight-current-row max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="申购数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
+                         @click.native="rowChange(scope.row)">编辑
+              </el-button>
+              <el-button type="text" size="small" @click.stop="true"
+                         @click.native="deleteCodeArray(scope.$index, scope.row)">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
 
-        <el-dialog
-            title="产品录入"
-            :visible.sync="selectProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="80%"
-            v-if="selectProductVisible"
-            :append-to-body='true'
-        >
-            <purApplyProducts
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-                :pId="pId"
-                :purType="1"
-            ></purApplyProducts>
-        </el-dialog>
+    <el-dialog
+      title="产品录入"
+      :visible.sync="selectProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      v-if="selectProductVisible"
+      :append-to-body='true'
+    >
+      <purApplyProducts
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :pId="pId"
+        :purType="1"
+      ></purApplyProducts>
+    </el-dialog>
 
-      <el-dialog
-        title="计划单据选入"
-        :visible.sync="selectApplyVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        width="80%"
-        append-to-body
-        v-if="selectApplyVisible"
-      >
-        <select-recelve-list-dialog
-          :data="thisData"
-          :pId="pId"
-          :closeDialog="closeDialogC2"
-        ></select-recelve-list-dialog>
-      </el-dialog>
+    <el-dialog
+      title="计划单据选入"
+      :visible.sync="selectApplyVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      append-to-body
+      v-if="selectApplyVisible"
+    >
+      <select-recelve-list-dialog
+        :data="thisData"
+        :pId="pId"
+        :closeDialog="closeDialogC2"
+      ></select-recelve-list-dialog>
+    </el-dialog>
 
-    </div>
+  </div>
 </template>
 
 <script>
@@ -179,350 +187,351 @@ import {addPlanId} from "@/api/purchase/purPlan";
 import SelectRecelveListDialog from "@/views/inout/receive/selectReveiceListDialog";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
-      changId: {
-        type: Boolean,
-        required: true,
-      },
-      isChang: {
-        type: Function,
-        required: true,
-      },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {
-                id: null,
-                billNo: null,
-                billDate: "",
-                remark: "",
-                deptCode: null,
-                invCode: null,
-                targetInvCode: null,
-                targetDeptCode: null,
-            },
-            pId: null,
-            formRules: {},
-            codeArray: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            orderEditor: true,
-            selectApplyVisible:false,
-            sOptions: [],
-            sValue: [],
-            sList: [],
-            sLoading: false,
-            busTypes: [],
-            currentRow: {},
-            selectedIndex: "",
-            selectProductVisible: false,
-            thisData: {},
-            storageList: [],
-            subInvList: [],
-            invQueryData: {},
-
-        };
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    changId: {
+      type: Boolean,
+      required: true,
     },
-   watch: {
-     isChang: function () {
-       this.$emit("cancelDialog", this.pId);
-     },
-   },
-    components: {
-        draggable,
-      purApplyProducts,
-      SelectRecelveListDialog
+    isChang: {
+      type: Function,
+      required: true,
     },
-    methods: {
-        saveOrder(status) {
-            this.$refs["dataForm"].validate(valid => {
-                if (valid) {
-                    if (this.codeArray.length < 1) {
-                        this.$message.warning('未添加产品');
-                        return;
-                    }
-                    if (status === '2') {
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {
+        billType: "CPSG",
+        id: null,
+        billNo: null,
+        billDate: "",
+        remark: "",
+        deptCode: null,
+        invCode: null,
+        targetInvCode: null,
+        targetDeptCode: null,
+      },
+      pId: null,
+      formRules: {},
+      codeArray: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      orderEditor: true,
+      selectApplyVisible: false,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      thisData: {},
+      storageList: [],
+      subInvList: [],
+      invQueryData: {},
 
-                        if(this.formData.billDate=="" || this.formData.billDate==null){
-                            return this.$message.error("单据日期不能为空！");
-                        }
-                        if(this.formData.targetInvCode=="" || this.formData.targetInvCode==null){
-                            return this.$message.error("采购科室不能为空！");
-                        }
-                        if(this.formData.emergency=="" || this.formData.emergency==null){
-                          return this.$message.error("紧急程度不能为空！");
-                        }
-                        if(this.formData.arrivalTime=="" || this.formData.arrivalTime==null){
-                          return this.$message.error("到货时间不能为空！");
-                        }
+    };
+  },
+  watch: {
+    isChang: function () {
+      this.$emit("cancelDialog", this.pId);
+    },
+  },
+  components: {
+    draggable,
+    purApplyProducts,
+    SelectRecelveListDialog
+  },
+  methods: {
+    saveOrder(status) {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (this.codeArray.length < 1) {
+            this.$message.warning('未添加产品');
+            return;
+          }
+          if (status === '2') {
 
-                        for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
-                                return this.$message.error('单据数量不能为0');
-                            }
-                        }
-                    }
-                    if (status == "1") {
-                        this.submitFunction(status);
-                    } else {
-                        let tip = "是否确定提交订单?";
-                        this.$confirm(tip, "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning",
-                        }).then(() => {
-                            this.submitFunction(status);
-                        }).catch(() => {
-                            this.loading = false;
-                        });
-                    }
-                }
-            });
-        },
-        submitFunction(status) {
-            let tMessage = status === '1' ? '保存' : '提交';
-            this.loading = true;
-            this.formData.id=this.pId;
-            this.formData.invCode=this.$store.getters.locInvCode
-            this.formData.deptCode=this.$store.getters.locDeptCode
-            let tQuery = {
-                type:1,
-                editStatus: status,
-                purApplyEntity: this.formData,
-                subErpOrders: this.codeArray,
-            }
-            inserThrOrderWeb(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(tMessage + "成功");
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        setWarehouseName(obj){
-            this.formData.targetDeptCode= this.subInvList.find(item => item.code == obj).parentId;
-        },
-        selectProductFunction() {
-            this.selectProductVisible = true;
-            //当父id为空的时候生成id
-            if(this.pId==null){
-              addApplyId().then(response => {
-                if (response.code === 20000) {
-                  this.pId=response.data
-                }
-              }).catch(() => {
-                this.loading = false;
-              })
+            if (this.formData.billDate == "" || this.formData.billDate == null) {
+              return this.$message.error("单据日期不能为空！");
             }
-            this.thisData.stockOrderLists = this.codeArray;
-        },
-        closeDialogC2(rData) {
-            this.selectProductVisible = false;
-            this.selectApplyVisible = false;
-            this.query={
-              orderIdFk:rData
+            if (this.formData.targetInvCode == "" || this.formData.targetInvCode == null) {
+              return this.$message.error("采购科室不能为空！");
             }
-            this.pId=rData;
-            listApplyDetail(this.query) //查找该单号下的所有条码
-              .then((response) => {
-                console.log(response)
-                this.codeArray = response.data.list || [];
-                this.total = response.data.total || 0;
-                this.loading = false;
-              })
-              .catch(() => {
-                this.loading = false;
-                this.list = [];
-                this.total = 0;
-              });
-        },
-        rowChange(val) {
-            this.currentRow = val;
-            this.selectedIndex = val.index;
-
-        },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-              updateDetail(this.currentRow);
+            if (this.formData.emergency == "" || this.formData.emergency == null) {
+              return this.$message.error("紧急程度不能为空！");
             }
-        },
-        tableRowClassName({row, rowIndex}) {
-            row.index = rowIndex;
-        },
-        // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
+            if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
+              return this.$message.error("到货时间不能为空！");
             }
-        },
-      selectApply() {
-        this.selectApplyVisible = true;
-        //当父id为空的时候生成id
-        if(this.pId==null){
-          addApplyId().then(response => {
-            if (response.code === 20000) {
-              this.pId=response.data
+
+            for (let i = 0; i < this.codeArray.length; i++) {
+              if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                return this.$message.error('单据数量不能为0');
+              }
             }
-          }).catch(() => {
-            this.loading = false;
-          })
-        }
-      },
-        deleteCodeArray(index, row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+          }
+          if (status == "1") {
+            this.submitFunction(status);
+          } else {
+            let tip = "是否确定提交订单?";
+            this.$confirm(tip, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
             }).then(() => {
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
-
-                if (this.orderEditor) {
-                    this.detailLoading = true;
-                    if (this.$isNotBlank(row.id)) {
-                        delApplyDetail(row.id)
-                            .then(response => {
-                                this.detailLoading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success(response.data);
-                                    // this.getStockOrderDetailList();
-                                    this.codeArray.splice(index, 1);
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.detailLoading = false;
-                            })
-                    } else {
-                        this.$message.success('删除成功');
-                        this.codeArray.splice(index, 1);
-                    }
-                } else {
-                    this.$message.success('删除成功');
-                    this.codeArray.splice(index, 1);
-                }
+              this.submitFunction(status);
             }).catch(() => {
-
+              this.loading = false;
             });
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            listApplyDetail(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-
-
-
-        findSubInvs() {
-            this.subInvList = [];
-            let query = {
-                filter:3
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                    if (this.subInvList != null && this.subInvList.length == 1) {
-                        this.formData.invWarehouseCode = this.subInvList[0].code;
-                    }
-                })
-                .catch(() => {
-                });
-        },
+          }
+        }
+      });
+    },
+    submitFunction(status) {
+      let tMessage = status === '1' ? '保存' : '提交';
+      this.loading = true;
+      this.formData.id = this.pId;
+      this.formData.invCode = this.$store.getters.locInvCode
+      this.formData.deptCode = this.$store.getters.locDeptCode
+      let tQuery = {
+        type: 1,
+        editStatus: status,
+        purApplyEntity: this.formData,
+        subErpOrders: this.codeArray,
+      }
+      inserThrOrderWeb(tQuery)
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success(tMessage + "成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
+    },
+    setWarehouseName(obj) {
+      this.formData.targetDeptCode = this.subInvList.find(item => item.code == obj).parentId;
+    },
+    selectProductFunction() {
+      this.selectProductVisible = true;
+      //当父id为空的时候生成id
+      if (this.pId == null) {
+        addApplyId().then(response => {
+          if (response.code === 20000) {
+            this.pId = response.data
+          }
+        }).catch(() => {
+          this.loading = false;
+        })
+      }
+      this.thisData.stockOrderLists = this.codeArray;
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.selectApplyVisible = false;
+      this.query = {
+        orderIdFk: rData
+      }
+      this.pId = rData;
+      listApplyDetail(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
 
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        updateDetail(this.currentRow);
+      }
+    },
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    selectApply() {
+      this.selectApplyVisible = true;
+      //当父id为空的时候生成id
+      if (this.pId == null) {
+        addApplyId().then(response => {
+          if (response.code === 20000) {
+            this.pId = response.data
+          }
+        }).catch(() => {
+          this.loading = false;
+        })
+      }
     },
-    created() {
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.query.limit = 100;
-            this.pId=this.idQuery.id;
-            this.query.orderIdFk = this.idQuery.id;
-            this.formData = this.idQuery.formData;
-            this.orderEditor = true;
-            this.sValue = this.formData.corpName;
-            this.getStockOrderDetailList();
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
+
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            delApplyDetail(row.id)
+              .then(response => {
+                this.detailLoading = false;
+                if (response.code === 20000) {
+                  this.$message.success(response.data);
+                  // this.getStockOrderDetailList();
+                  this.codeArray.splice(index, 1);
+                } else {
+                  this.$message.error(response.message);
+                }
+              })
+              .catch(() => {
+                this.detailLoading = false;
+              })
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
         } else {
-            this.formData = {
-                id: null,
-                billNo: null,
-                billDate: "",
-                remark: "",
-                deptCode: null,
-                locStorageCode: null,
-                invWarehouseCode: null,
-            };
-            this.orderEditor = false;
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
         }
-        this.findSubInvs();
-        this.codeArray = [];
+      }).catch(() => {
+
+      });
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      listApplyDetail(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+
+    findSubInvs() {
+      this.subInvList = [];
+      let query = {
+        filter: 3
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          if (this.subInvList != null && this.subInvList.length == 1) {
+            this.formData.invWarehouseCode = this.subInvList[0].code;
+          }
+        })
+        .catch(() => {
+        });
     },
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.pId = this.idQuery.id;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+    } else {
+      this.formData = {
+        id: null,
+        billNo: null,
+        billDate: "",
+        remark: "",
+        billType: "CPSG",
+        deptCode: null,
+        locStorageCode: null,
+        invWarehouseCode: null,
+      };
+      this.orderEditor = false;
+    }
+    this.findSubInvs();
+    this.codeArray = [];
+  },
 };
 </script>
 <style>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 1f47340e..6d642305 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -212,6 +212,7 @@ export default {
         billNo: null,
         billDate: "",
         remark: "",
+        billType: "CGDD",
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
@@ -281,10 +282,10 @@ export default {
             if (this.formData.invCode == "" || this.formData.invCode == null) {
               return this.$message.error("采购仓库不能为空！");
             }
-            if(this.formData.emergency=="" || this.formData.emergency==null){
+            if (this.formData.emergency == "" || this.formData.emergency == null) {
               return this.$message.error("紧急程度不能为空！");
             }
-            if(this.formData.arrivalTime=="" || this.formData.arrivalTime==null){
+            if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
               return this.$message.error("到货时间不能为空！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
@@ -500,6 +501,7 @@ export default {
         billNo: null,
         billDate: "",
         remark: "",
+        billType: "CGDD",
         deptCode: null,
         incCode: null,
       };
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index 63b0ffbe..3486ed63 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -212,6 +212,7 @@ export default {
         billNo: null,
         billDate: "",
         remark: "",
+        billType: "CGJH",
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
@@ -281,10 +282,10 @@ export default {
             if (this.formData.invCode == "" || this.formData.invCode == null) {
               return this.$message.error("采购仓库不能为空！");
             }
-            if(this.formData.emergency=="" || this.formData.emergency==null){
+            if (this.formData.emergency == "" || this.formData.emergency == null) {
               return this.$message.error("紧急程度不能为空！");
             }
-            if(this.formData.arrivalTime=="" || this.formData.arrivalTime==null){
+            if (this.formData.arrivalTime == "" || this.formData.arrivalTime == null) {
               return this.$message.error("到货时间不能为空！");
             }
             for (let i = 0; i < this.codeArray.length; i++) {
@@ -499,6 +500,7 @@ export default {
         billNo: null,
         billDate: "",
         remark: "",
+        billType: "CGJH",
         deptCode: null,
         incCode: null,
       };
diff --git a/src/views/remind/addInvRemindSetDialog.vue b/src/views/remind/addInvRemindSetDialog.vue
new file mode 100644
index 00000000..0669992b
--- /dev/null
+++ b/src/views/remind/addInvRemindSetDialog.vue
@@ -0,0 +1,335 @@
+<template>
+  <div>
+    <el-form :model="formData" label-width="200px">
+      <el-card>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="是否开启低库存预警">
+              <el-select v-model="formData.lowStock">
+                <el-option :value="true" label="开启"></el-option>
+                <el-option :value="false" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="是否开启负库存预警">
+              <el-select v-model="formData.lackStock">
+                <el-option :value="true" label="开启"></el-option>
+                <el-option :value="false" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="是否开启库存积压预警">
+              <el-select v-model="formData.overStock">
+                <el-option :value="true" label="开启"></el-option>
+                <el-option :value="false" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="是否开启产品过期预警">
+              <el-select v-model="formData.expireDate">
+                <el-option :value="true" label="开启"></el-option>
+                <el-option :value="false" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="10">
+            <el-form-item class="query-form-item" label="是否开启近效期预警">
+              <el-select v-model="formData.recentDate">
+                <el-option :value="true" label="开启"></el-option>
+                <el-option :value="false" label="关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-divider></el-divider>
+
+      <el-form v-model="productQuery" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="仓库名称:">
+              <el-select v-model="productQuery.invCode" placeholder="请选择所属仓库"
+                         @change="invChange"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="货位名称:">
+              <el-select v-model="productQuery.invSpaceCode" placeholder="请选择货位"
+                         @change="invSpaceChange"
+                         clearable
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in spaceList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="productQuery.cpmctymc" clearable style="width: 90%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="产品DI:">
+              <el-input v-model="productQuery.nameCode" clearable style="width: 90%"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="供应商名称:">
+              <el-input v-model="productQuery.supName" clearable style="width: 90%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" @click.native="queryProductList" icon="el-icon-search">搜索</el-button>
+          <el-button type="primary" @click.native="formSubmit" icon="el-icon-check">选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-table v-loading="loading" :data="productList" style="width: 100%" border ref="multipleTable"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
+        <el-table-column label="供应商名称" prop="supName" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="productTotal>0"
+        :total="productTotal"
+        :page.sync="productQuery.page"
+        :limit.sync="productQuery.limit"
+        @pagination="getInvProductList"
+      />
+    </el-form>
+
+  </div>
+</template>
+
+<script>
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getInvSpaceList} from "@/api/inventory/invSpace";
+import {isBlank} from "@/utils/strUtil";
+import {batchAddInvRemindSet} from "@/api/system/invRemindSet";
+import {getInvProduct} from "@/api/inventory/invPorduct";
+
+export default {
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true
+    }
+  },
+  name: "addInvRemindSetDialog",
+  data() {
+    return {
+      formData: {
+        deptCode: this.$store.getters.locDeptCode,
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        lowStock: false,
+        lackStock: false,
+        overStock: false,
+        expireDate: false,
+        recentDate: false
+      },
+      invList: [],
+      spaceList: [],
+      productList: [],
+      formLoading: false,
+      productVisible: false,
+      loading: false,
+      productQuery: {
+        invCode: this.$store.getters.locInvCode,
+        invSpaceCode: null,
+        cpmctymc: null,
+        nameCode: null,
+        page: 1,
+        limit: 10
+      },
+      productTotal: 0,
+      multipleSelection: [],
+      showSearch: true
+    };
+  },
+  methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    invChange() {
+      this.multipleSelection = [];
+      this.spaceList = [];
+      this.formData.invSpaceCode = null;
+      this.formData.relId = null;
+      this.formData.ggxh = null;
+      this.getInvProductList();
+      this.getSpaceList();
+    },
+    getInvList() {
+      getInvListByUser()
+        .then((response) => {
+          this.invList = response.data || [];
+          this.getSpaceList();
+          this.getInvProductList();
+        })
+        .catch(() => {
+        });
+    },
+    getSpaceList() {
+      let params = {invWarehouseCode: this.formData.invCode, status: 1};
+      getInvSpaceList(params).then((res) => {
+        this.spaceList = res.data.list || [];
+      })
+    },
+    invSpaceChange() {
+      this.multipleSelection = [];
+    },
+    formSubmit() {
+      let message = this.verifyFormData();
+      if (message !== "success") {
+        this.$message.error(message);
+        return;
+      }
+
+
+      let relIdList = [];
+      if (this.multipleSelection.length > 0) {
+        this.multipleSelection.forEach((item) => {
+          relIdList.push(item.relIdFk);
+        });
+      } else {
+        this.$message.error("请选择需要预警的产品");
+        return;
+      }
+
+      //添加预警设置
+      let params = {
+        lowStock: this.formData.lowStock,
+        lackStock: this.formData.lackStock,
+        overStock: this.formData.overStock,
+        expireDate: this.formData.expireDate,
+        recentDate: this.formData.recentDate,
+        deptCode: this.formData.deptCode,
+        invCode: this.formData.invCode,
+        invSpaceCode: this.formData.invSpaceCode,
+        relIdList: relIdList
+      };
+      batchAddInvRemindSet(params).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("添加成功");
+          this.closeDialog();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.closeDialog();
+      })
+    },
+    verifyFormData() {
+      if (isBlank(this.formData.invCode)) {
+        return "请选择预警仓库";
+      }
+      if (this.formData.lowStock === false && this.formData.lackStock === false && this.formData.overStock === false && this.formData.expireDate === false && this.formData.recentDate === false) {
+        return "至少开启一项预警";
+      }
+      return "success";
+    },
+    selectProduct() {
+      this.productVisible = true;
+      this.getInvProductList();
+      this.productQuery = {
+        invCode: this.formData.invCode,
+        invSpaceCode: this.formData.invSpaceCode,
+        page: 1,
+        limit: 10
+      };
+      this.productTotal = 0;
+    },
+    getInvProductList() {
+      getInvProduct(this.productQuery).then((res) => {
+        if (res.code === 20000) {
+          this.productList = res.data.list || [];
+          this.productTotal = res.data.total || 0;
+        } else {
+          this.productList = [];
+          this.productTotal = 0;
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+        this.productList = [];
+        this.productTotal = 0;
+      })
+    },
+    onReset() {
+      this.productQuery = {
+        invCode: this.formData.invCode,
+        invSpaceCode: this.formData.invSpaceCode,
+        cpmctymc: null,
+        nameCode: null,
+        page: 1,
+        limit: 10
+      };
+      this.productTotal = 0;
+      this.productList = [];
+      this.getInvProductList()
+    },
+    queryProductList() {
+      this.getInvProductList();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+  },
+  created() {
+    this.getInvList();
+  },
+};
+</script>
+<style type="text/scss" lang="scss">
+.el-radio {
+  width: 20%;
+}
+</style>
diff --git a/src/views/remind/invRemindSet.vue b/src/views/remind/invRemindSet.vue
index e445901e..01b53978 100644
--- a/src/views/remind/invRemindSet.vue
+++ b/src/views/remind/invRemindSet.vue
@@ -1,53 +1,81 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="仓库:">
-          <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
-                     @change="invChange"
-                     style="width: 90%"
-          >
-            <el-option
-              v-for="item in invList"
-              :key="item.name"
-              :label="item.name"
-              :value="item.code">
-              <span style="float: left">{{ item.name }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="货位:">
-          <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
-                     @change="invSpaceChange"
-          >
-            <el-option
-              v-for="item in spaceList"
-              :key="item.name"
-              :label="item.name"
-              :value="item.code">
-              <span style="float: left">{{ item.name }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="产品名称:">
-          <el-autocomplete
-            class="inline-input"
-            v-model="queryName"
-            :fetch-suggestions="queryProductName"
-            placeholder="请输入内容"
-            clearable
-            @select="handleSelect"
-            @clear="clearQueryProduct"
-          ></el-autocomplete>
-        </el-form-item>
-        <el-form-item>
-          <el-button-group>
-            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
-            <el-button type="primary" @click.native="search" icon="el-icon-search">搜索</el-button>
-            <el-button type="primary" @click.native="addSet" icon="el-icon-plus">新增库存预警设置</el-button>
-          </el-button-group>
-        </el-form-item>
+      <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         @change="invChange"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="货位:">
+              <el-select v-model="filterQuery.invSpaceCode" placeholder="请选择货位" clearable="true"
+                         style="width: 90%"
+                         @change="invSpaceChange"
+              >
+                <el-option
+                  v-for="item in spaceList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="产品名称:">
+              <el-autocomplete
+                class="inline-input"
+                v-model="queryName"
+                :fetch-suggestions="queryProductName"
+                placeholder="请输入内容"
+                clearable
+                @select="handleSelect"
+                @clear="clearQueryProduct"
+                style="width: 90%"
+              ></el-autocomplete>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="状态:">
+              <el-select v-model="filterQuery.status" clearable style="width: 90%">
+                <el-option :value="0" label="未启用"></el-option>
+                <el-option :value="1" label="已启用"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" @click.native="search" icon="el-icon-search">搜索</el-button>
+          <el-button type="primary" @click.native="addSet" icon="el-icon-plus">新增库存预警设置</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
       <el-table v-loading="loading" :data="list" style="width: 120%" border>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
@@ -80,7 +108,7 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="120">
+        <el-table-column label="操作" width="120" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -105,16 +133,29 @@
         @pagination="getList"
       />
 
+      <!--表单-->
+      <el-dialog
+        v-if="addVisible"
+        title="新增预警设置"
+        :visible.sync="addVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :before-close="closeAddDialog"
+        width="60%"
+      >
+        <addInvRemindSetDialog
+          :closeDialog="closeAddDialog"
+        ></addInvRemindSetDialog>
+      </el-dialog>
+
       <!--表单-->
       <el-dialog
         v-if="formVisible"
-        :title="formMap[formName]"
+        title="编辑预警设置"
         :visible.sync="formVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
-        :before-close="closeDialog"
         width="60%"
-        top="5vh"
       >
         <invRemindSetModify
           :invRemindSetData="formData"
@@ -136,6 +177,7 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
 import {filterProductNames} from "@/api/inventory/invPorduct";
 import invRemindSetModify from "@/views/remind/invRemindSetModify.vue";
+import addInvRemindSetDialog from "@/views/remind/addInvRemindSetDialog.vue";
 
 export default {
   name: "invRemindSet",
@@ -145,6 +187,7 @@ export default {
         relId: null,
         invCode: this.$store.getters.locInvCode,
         invSpaceCode: null,
+        status: 1,
         page: 1,
         limit: 20,
       },
@@ -181,10 +224,14 @@ export default {
       invList: [],
       spaceList: [],
       queryName: null,
-
+      addVisible: false,
+      showSearch: true
     };
   },
   methods: {
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     onReset() {
       this.$router.push({
         path: "",
@@ -193,10 +240,12 @@ export default {
         relId: null,
         invCode: this.$store.getters.locInvCode,
         invSpaceCode: null,
+        status: 1,
         page: 1,
         limit: 20,
       };
       this.getList();
+      this.queryName=null;
     },
     search() {
       this.filterQuery.page = 1;
@@ -232,22 +281,8 @@ export default {
       }
     },
     addSet() {
-      this.formData = {
-        id: null,
-        relId: null,
-        ggxh: null,
-        deptCode: this.$store.getters.locDeptCode,
-        invCode: this.$store.getters.locInvCode,
-        invSpaceCode: null,
-        lowStock: false,
-        lackStock: false,
-        overStock: false,
-        expireDate: false,
-        recentDate: false,
-        remark: null
-      };
       this.formName = "add";
-      this.formVisible = true;
+      this.addVisible = true;
     },
 
     deleteSet(id) {
@@ -348,6 +383,10 @@ export default {
       };
       this.getList();
     },
+    closeAddDialog() {
+      this.addVisible = false;
+      this.getList();
+    },
     // 显示表单
     handleForm(index, row) {
       this.formData = row;
@@ -356,7 +395,8 @@ export default {
     },
   },
   components: {
-    invRemindSetModify
+    invRemindSetModify,
+    addInvRemindSetDialog
   },
   created() {
     this.getInvList();
diff --git a/src/views/remind/invRemindSetModify.vue b/src/views/remind/invRemindSetModify.vue
index f5f3ad0f..c4022c0c 100644
--- a/src/views/remind/invRemindSetModify.vue
+++ b/src/views/remind/invRemindSetModify.vue
@@ -1,118 +1,84 @@
 <template>
   <div>
-    <el-form :model="setData" label-width="200px" style="margin-bottom: -15px">
+    <el-form :model="setData" label-width="200px">
       <el-row>
         <el-col :span="10">
           <el-form-item class="query-form-item" label="仓库:">
-            <el-select v-model="setData.invCode" placeholder="请选择所属仓库"
-                       @change="invChange"
-                       style="width: 90%"
-            >
-              <el-option
-                v-for="item in invList"
-                :key="item.name"
-                :label="item.name"
-                :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-
+            <el-input v-model="setData.invName" style="width: 90%" :disabled="true"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="10">
           <el-form-item class="query-form-item" label="货位:">
-            <el-select v-model="setData.invSpaceCode" placeholder="请选择货位"
-                       @change="invSpaceChange"
-                       style="width: 90%"
-            >
-              <el-option
-                v-for="item in spaceList"
-                :key="item.name"
-                :label="item.name"
-                :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
+            <el-input v-model="setData.invSpaceName" style="width: 90%" :disabled="true"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row>
         <el-col :span="10">
-          <el-form-item class="query-form-item" label="产品名称:">
-            <el-select v-model="setData.relId" placeholder="请选择货位"
-                       style="width: 90%"
-                       @change="handleSelectProduct"
-            >
-              <el-option
-                v-for="item in productList"
-                :key="item.cpmctymc"
-                :label="item.cpmctymc"
-                :value="item.relIdFk"
-              >
-                <span style="float: left">{{ item.cpmctymc }}</span>
-                <span style="float: right">{{ item.ggxh }}</span>
-              </el-option>
-            </el-select>
+          <el-form-item class="query-form-item" label="物资名称:">
+            <el-input v-model="setData.productName" style="width: 90%" :disabled="true"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="10">
           <el-form-item class="query-form-item" label="规格型号:">
-            <el-input
-              placeholder="规格型号"
-              v-model="setData.ggxh"
-              :disabled="true"
-              style="width: 90%"
-            >
-            </el-input>
+            <el-input v-model="setData.ggxh" style="width: 90%" :disabled="true"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
+      <el-divider></el-divider>
+
       <el-row>
-        <el-col :span="20">
+        <el-col :span="10">
           <el-form-item class="query-form-item" label="是否开启低库存预警">
-            <el-radio v-model="setData.lowStock" :label="true" border>开启</el-radio>
-            <el-radio v-model="setData.lowStock" :label="false" border>关闭</el-radio>
+            <el-select v-model="setData.lowStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="20">
+
+        <el-col :span="10">
           <el-form-item class="query-form-item" label="是否开启负库存预警">
-            <el-radio v-model="setData.lackStock" :label="true" border>开启</el-radio>
-            <el-radio v-model="setData.lackStock" :label="false" border>关闭</el-radio>
+            <el-select v-model="setData.lackStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row>
-        <el-col :span="20">
+        <el-col :span="10">
           <el-form-item class="query-form-item" label="是否开启库存积压预警">
-            <el-radio v-model="setData.overStock" :label="true" border>开启</el-radio>
-            <el-radio v-model="setData.overStock" :label="false" border>关闭</el-radio>
+            <el-select v-model="setData.overStock">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="20">
+
+        <el-col :span="10">
           <el-form-item class="query-form-item" label="是否开启产品过期预警">
-            <el-radio v-model="setData.expireDate" :label="true" border>开启</el-radio>
-            <el-radio v-model="setData.expireDate" :label="false" border>关闭</el-radio>
+          1
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row>
-        <el-col :span="20">
+        <el-col :span="10">
           <el-form-item class="query-form-item" label="是否开启近效期预警">
-            <el-radio v-model="setData.recentDate" :label="true" border>开启</el-radio>
-            <el-radio v-model="setData.recentDate" :label="false" border>关闭</el-radio>
+            <el-select v-model="setData.recentDate">
+              <el-option :value="true" label="开启"></el-option>
+              <el-option :value="false" label="关闭"></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
-      </el-row>
     </el-form>
 
     <div slot="footer" class="dialog-footer">
@@ -128,7 +94,6 @@
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
 import {filterProductNames} from "@/api/inventory/invPorduct";
-import {getGgxhList} from "@/api/basic/product/udiRelevance";
 import {isBlank} from "@/utils/strUtil";
 import {saveInvRemindSet} from "@/api/system/invRemindSet";
 
@@ -261,6 +226,6 @@ export default {
 </script>
 <style type="text/scss" lang="scss">
 .el-radio {
-  width: 10%;
+  width: 20%;
 }
 </style>
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index f5ba9d0e..f8d6edfa 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -1,70 +1,78 @@
 <template>
   <el-card>
-
-    <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
+    <el-descriptions
+      class="margin-top"
+      title="数据同步设置"
+      :column="1"
+      :size="100"
+      border
+    >
       <template slot="extra">
-        <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
+        <el-button type="primary" size="small" @click="saveConfig()"
+          >保存</el-button
+        >
       </template>
       <el-descriptions-item>
-        <template slot="label">
-          同步服务
-        </template>
+        <template slot="label"> 同步服务 </template>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="6" class="el-col">
-
             <el-switch
               v-model="configQuery.downstreamEnable"
-              active-text="是否启用数据同步">
+              active-text="是否启用数据同步"
+            >
             </el-switch>
-
           </el-col>
           <el-col :span="14" class="el-col">
             <div>
-              <span style="color: red;">说明:&nbsp;修改同步参数时,请关闭数据同步服务 </span>
+              <span style="color: red"
+                >说明:&nbsp;修改同步参数时,请关闭数据同步服务
+              </span>
             </div>
           </el-col>
-
         </el-row>
       </el-descriptions-item>
 
       <el-descriptions-item>
-        <template slot="label">
-          地址设置
-        </template>
+        <template slot="label"> 地址设置 </template>
 
         <el-row :gutter="20" class="el-row" type="flex">
-
           <el-col :span="20" class="el-col">
             <div>
               <span>服务地址:&nbsp;</span>
               <el-input
                 style="width: 50%"
                 size="small"
-                v-model="configQuery.syncIp" :disabled="configQuery.downstreamEnable"
+                v-model="configQuery.syncIp"
+                :disabled="configQuery.downstreamEnable"
                 splaceholder="请输入内容"
               ></el-input>
-              <el-button type="primary" size="small" @click="testConnect()" style="margin-left: 20px;"
-                         :disabled="configQuery.downstreamEnable"
-                         :loading="testLoading">测试连通
+              <el-button
+                type="primary"
+                size="small"
+                @click="testConnect()"
+                style="margin-left: 20px"
+                :disabled="configQuery.downstreamEnable"
+                :loading="testLoading"
+                >测试连通
               </el-button>
-
             </div>
           </el-col>
         </el-row>
-
       </el-descriptions-item>
     </el-descriptions>
-    <el-descriptions class="margin-top" title="上传至UDI自助平台基础数据" :column="1" :size="100"
-                     style="margin-top: 40px"
-                     border>
-
+    <el-descriptions
+      class="margin-top"
+      title="上传至UDI自助平台基础数据"
+      :column="1"
+      :size="100"
+      style="margin-top: 40px"
+      border
+    >
+      <!-- 参数设置 -->
       <el-descriptions-item>
-        <template slot="label">
-          参数设置
-        </template>
+        <template slot="label"> 参数设置 </template>
 
         <el-row :gutter="20" class="el-row" type="flex">
-
           <el-col :span="20" class="el-col">
             <div>
               <span>数据上传时间间隔(单位:分钟):&nbsp;</span>
@@ -72,106 +80,327 @@
                 style="width: 100px"
                 size="small"
                 type="number"
-                v-model="configQuery.syncTime" :disabled="configQuery.downstreamEnable"
+                v-model="configQuery.syncTime"
+                :disabled="configQuery.downstreamEnable"
                 splaceholder="请输入内容"
               ></el-input>
-              <span style="margin-left: 30px;">延时上传(单位:分钟):&nbsp;</span>
+              <span style="margin-left: 30px">延时上传(单位:分钟):&nbsp;</span>
               <el-input
                 style="width: 100px"
                 size="small"
                 type="number"
-                v-model="configQuery.delaySyncTime" :disabled="configQuery.downstreamEnable"
+                v-model="configQuery.delaySyncTime"
+                :disabled="configQuery.downstreamEnable"
                 splaceholder="请输入内容"
               ></el-input>
 
-              <span style="margin-left: 30px;">数据下载时间间隔(单位:分钟):&nbsp;</span>
+              <span style="margin-left: 30px"
+                >数据下载时间间隔(单位:分钟):&nbsp;</span
+              >
               <el-input
                 style="width: 100px"
                 size="small"
                 type="number"
-                v-model="configQuery.syncDownloadTime" :disabled="configQuery.downstreamEnable"
+                v-model="configQuery.syncDownloadTime"
+                :disabled="configQuery.downstreamEnable"
                 splaceholder="请输入内容"
               ></el-input>
             </div>
           </el-col>
         </el-row>
-
       </el-descriptions-item>
-
+      <!-- 系统设置信息 -->
       <el-descriptions-item>
-        <template slot="label">
-          运行参数
-        </template>
-        <el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable">委托验收
-        </el-checkbox>
+        <template slot="label"> 系统设置信息 </template>
+        <el-row type="flex" justify="space-between">
+          <div>
+            <span style="margin-right: 5px">系统运行参数</span>
+            <el-select v-model="configQuery.systemConfig" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">委托验收</span>
+            <el-select v-model="configQuery.entrustAction" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">打印设置</span>
+            <el-select v-model="configQuery.printConfig" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">自动建出入库单设置</span>
+            <el-select v-model="configQuery.scanChangeConfig" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">自动建业务单设置</span>
+            <el-select v-model="configQuery.busChangeConfig" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+        </el-row>
       </el-descriptions-item>
+      <!-- 单据类型 -->
       <el-descriptions-item>
-        <template slot="label">
-          单据类型
-        </template>
-        <el-checkbox v-model="configQuery.typeBus" :disabled="configQuery.downstreamEnable">业务单据类型</el-checkbox>
-        <el-checkbox v-model="configQuery.typeScan" :disabled="configQuery.downstreamEnable">扫码单据类型
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.typeThird" :disabled="configQuery.downstreamEnable">第三方单据类型
-        </el-checkbox>
+        <template slot="label"> 单据类型 </template>
+        <el-row type="flex" justify="space-between">
+          <div>
+            <span style="margin-right: 5px">业务单据类型</span>
+            <el-select v-model="configQuery.typeBus" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">扫码单据类型</span>
+            <el-select v-model="configQuery.typeScan" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">第三方单据类型</span>
+            <el-select v-model="configQuery.typeThird" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+        </el-row>
       </el-descriptions-item>
-
+      <!-- 用户信息 -->
       <el-descriptions-item>
-        <template slot="label">
-          基础信息
-        </template>
-        <el-checkbox v-model="configQuery.basicProducts" :disabled="configQuery.downstreamEnable">耗材字典
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.basicCorp" :disabled="configQuery.downstreamEnable">往来单位字典
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.basicInv" :disabled="configQuery.downstreamEnable">仓库字典</el-checkbox>
-        <el-checkbox v-model="configQuery.sysUser" :disabled="configQuery.downstreamEnable">用户信息</el-checkbox>
+        <template slot="label"> 用户信息 </template>
+        <el-row type="flex" justify="space-between">
+          <div>
+            <span style="margin-right: 5px">部门信息</span>
+            <el-select v-model="configQuery.basicDept" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">仓库字典</span>
+            <el-select v-model="configQuery.basicInv" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">用户信息</span>
+            <el-select v-model="configQuery.sysUser" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+        </el-row>
       </el-descriptions-item>
+      <!-- 基础数据 -->
       <el-descriptions-item>
-        <template slot="label">
-          第三方基础信息
-        </template>
-        <el-checkbox v-model="configQuery.basicThirdProducts" :disabled="configQuery.downstreamEnable">第三方产品信息
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.basicThirdCorp" :disabled="configQuery.downstreamEnable">第三方往来信息
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.basicThirdInv" :disabled="configQuery.downstreamEnable">第三方仓库信息
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.basicThirdBusOrder" :disabled="configQuery.downstreamEnable">第三方业务单据
-        </el-checkbox>
+        <template slot="label"> 基础数据 </template>
+        <el-row type="flex" justify="space-between">
+          <div>
+            <span style="margin-right: 5px">耗材字典</span>
+            <el-select v-model="configQuery.basicProducts" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">往来单位字典</span>
+            <el-select v-model="configQuery.basicCorp" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">首营资质信息</span>
+            <el-select v-model="configQuery.supCert" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+        </el-row>
       </el-descriptions-item>
-
-      <!--            <el-descriptions-item>-->
-      <!--                <template slot="label">-->
-      <!--                    国家库DI数据-->
-      <!--                </template>-->
-      <!--                <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>-->
-      <!--            </el-descriptions-item>-->
-
+      <!-- 第三方基础信息 -->
       <el-descriptions-item>
-        <template slot="label">
-          首营资质证书
-        </template>
-        <el-checkbox v-model="configQuery.companyCert" :disabled="configQuery.downstreamEnable">配送企业
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.manufacturerCert" :disabled="configQuery.downstreamEnable">生产企业
-        </el-checkbox>
-        <el-checkbox v-model="configQuery.productCert" :disabled="configQuery.downstreamEnable">配送产品
-        </el-checkbox>
+        <template slot="label"> 第三方基础信息 </template>
+        <el-row type="flex" justify="space-between">
+          <div>
+            <span style="margin-right: 5px">第三方产品信息</span>
+            <el-select v-model="configQuery.basicThirdProducts" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">第三方往来信息</span>
+            <el-select v-model="configQuery.basicThirdCorp" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">第三方仓库信息</span>
+            <el-select v-model="configQuery.basicThirdInv" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">第三方业务单据</span>
+            <el-select v-model="configQuery.basicThirdBusOrder" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+        </el-row>
+      </el-descriptions-item>
+      <!-- 国家库DI数据 -->
+      <el-descriptions-item>
+        <template slot="label"> 国家库DI数据 </template>
+        <el-row type="flex" justify="space-between">
+          <div>
+            <span style="margin-right: 5px">DI产品信息</span>
+            <el-select v-model="configQuery.dbDiProducts" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+          <div>
+            <span style="margin-right: 5px">医疗器械注册人</span>
+            <el-select v-model="configQuery.dbDiProducts" clearable>
+              <el-option :value="0" label="不同步"></el-option>
+              <el-option :value="1" label="由内向外"></el-option>
+              <el-option :value="2" label="由外向内"></el-option>
+            </el-select>
+          </div>
+        </el-row>
+        <!-- <el-checkbox v-model="configQuery.dbDiProducts">DI产品信息</el-checkbox>
+        <el-checkbox v-model="configQuery.dbDiProducts"
+          >医疗器械注册人</el-checkbox
+        > -->
       </el-descriptions-item>
     </el-descriptions>
 
-    <el-descriptions class="margin-top" title="上传至UDI自助平台扫码单据" :column="1" :size="100"
-                     style="margin-top: 40px"
-                     border>
-
+    <el-descriptions
+      class="margin-top"
+      title="UDI自助平台同步至UDI管理系统扫码单据"
+      :column="1"
+      :size="100"
+      style="margin-top: 40px"
+      border
+    >
       <el-descriptions-item>
-        <template slot="label">
-          参数设置
-        </template>
+        <template slot="label"> 参数设置 </template>
 
         <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="20" class="el-col">
+            <div>
+              <span>单据上传时间间隔(单位:分钟):&nbsp;</span>
+              <el-input
+                style="width: 100px"
+                size="small"
+                type="number"
+                v-model="configQuery.orderToInSyncTime"
+                :disabled="configQuery.downstreamEnable"
+                splaceholder="请输入内容"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+      </el-descriptions-item>
 
+      <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
+        <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="configQuery.downstreamEnable"
+            @click="addToInBusTypeDialog()"
+            >添加扫码单据类型
+          </el-button>
+        </div>
+        <el-table :data="checkedToInBusTypes" border style="width: 100%">
+          <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="单据类型"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="单据类型代码"
+            prop="action"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="250" label="单据状态">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.orderStatus"
+                placeholder="请选择单据状态"
+              >
+                <el-option label="待校验" :value="3">待校验</el-option>
+                <el-option label="待核对" :value="5">待核对</el-option>
+                <el-option label="待审核" :value="10">待审核</el-option>
+                <el-option label="已审核" :value="7">已审核</el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                :disabled="configQuery.downstreamEnable"
+                @click.native="removeToInBus(scope.$index, scope.row)"
+                >移除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions
+      class="margin-top"
+      title="UDI管理系统同步至UDI自助平台扫码单据"
+      :column="1"
+      :size="100"
+      style="margin-top: 40px"
+      border
+    >
+      <el-descriptions-item>
+        <template slot="label"> 参数设置 </template>
+
+        <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="20" class="el-col">
             <div>
               <span>单据上传时间间隔(单位:分钟):&nbsp;</span>
@@ -179,97 +408,179 @@
                 style="width: 100px"
                 size="small"
                 type="number"
-                v-model="configQuery.orderSyncTime" :disabled="configQuery.downstreamEnable"
+                v-model="configQuery.orderSyncTime"
+                :disabled="configQuery.downstreamEnable"
                 splaceholder="请输入内容"
               ></el-input>
 
-              <span style="margin-left: 30px;">单据下载时间间隔(单位:分钟):&nbsp;</span>
+              <span style="margin-left: 30px"
+                >单据下载时间间隔(单位:分钟):&nbsp;</span
+              >
               <el-input
                 style="width: 100px"
                 size="small"
                 type="number"
-                v-model="configQuery.orderSyncDlTime" :disabled="configQuery.downstreamEnable"
+                v-model="configQuery.orderSyncDlTime"
+                :disabled="configQuery.downstreamEnable"
                 splaceholder="请输入内容"
               ></el-input>
             </div>
           </el-col>
         </el-row>
-
       </el-descriptions-item>
 
       <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
-
-        <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-          <el-button type="primary" size="small"
-                     :disabled="configQuery.downstreamEnable"
-                     @click="addBusTypeDialog()">添加扫码单据类型
+        <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="configQuery.downstreamEnable"
+            @click="addBusTypeDialog()"
+            >添加扫码单据类型
           </el-button>
         </div>
         <el-table :data="checkedBusTypes" border style="width: 100%">
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="单据类型" prop="name" show-overflow-tooltip></el-table-column>
-          <el-table-column label="单据类型代码" prop="action" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            label="单据类型"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="单据类型代码"
+            prop="action"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column width="250" label="单据状态">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.orderStatus" placeholder="请选择单据状态">
-                <el-option label="待校验" :value=3>待校验</el-option>
-                <el-option label="待核对" :value=5>待核对</el-option>
-                <el-option label="待审核" :value=10>待审核</el-option>
-                <el-option label="已审核" :value=7>已审核</el-option>
+              <el-select
+                v-model="scope.row.orderStatus"
+                placeholder="请选择单据状态"
+              >
+                <el-option label="待校验" :value="3">待校验</el-option>
+                <el-option label="待核对" :value="5">待核对</el-option>
+                <el-option label="待审核" :value="10">待审核</el-option>
+                <el-option label="已审核" :value="7">已审核</el-option>
               </el-select>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <el-button type="text" size="small" :disabled="configQuery.downstreamEnable"
-                         @click.native="remveBus(scope.$index, scope.row)">移除
+              <el-button
+                type="text"
+                size="small"
+                :disabled="configQuery.downstreamEnable"
+                @click.native="remveBus(scope.$index, scope.row)"
+                >移除
               </el-button>
             </template>
           </el-table-column>
         </el-table>
-
       </el-descriptions-item>
-
     </el-descriptions>
 
-    <el-descriptions class="margin-top" title="上传至UDI自助平台业务单据" :column="1" :size="100"
-                     style="margin-top: 40px"
-                     border>
+    <el-descriptions
+      class="margin-top"
+      title="UDI管理系统同步至UDI自助平台业务单据"
+      :column="1"
+      :size="100"
+      style="margin-top: 40px"
+      border
+    >
       <el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
-
-        <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-          <el-button type="primary" size="small"
-                     :disabled="configQuery.downstreamEnable"
-                     @click="addChangeBusTypeDialog()">添加业务单据类型
+        <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="configQuery.downstreamEnable"
+            @click="addChangeBusTypeDialog()"
+            >添加业务单据类型
           </el-button>
         </div>
         <el-table :data="checkedChangeBusTypes" border style="width: 100%">
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="单据类型" prop="name" show-overflow-tooltip></el-table-column>
-          <el-table-column label="单据类型代码" prop="action" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            label="单据类型"
+            prop="name"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            label="单据类型代码"
+            prop="action"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column width="250" label="单据状态">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.orderStatus" placeholder="请选择单据状态">
-                <el-option label="待校验" :value=3>待校验</el-option>
-                <el-option label="待核对" :value=5>待核对</el-option>
-                <el-option label="待审核" :value=10>待审核</el-option>
-                <el-option label="已审核" :value=7>已审核</el-option>
+              <el-select
+                v-model="scope.row.orderStatus"
+                placeholder="请选择单据状态"
+              >
+                <el-option label="待校验" :value="1">草稿</el-option>
+                <el-option label="待核对" :value="2">未审核</el-option>
+                <el-option label="待审核" :value="3">已审核</el-option>
               </el-select>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
-              <el-button type="text" size="small" :disabled="configQuery.downstreamEnable"
-                         @click.native="removeChangeBus(scope.$index, scope.row)">移除
+              <el-button
+                type="text"
+                size="small"
+                :disabled="configQuery.downstreamEnable"
+                @click.native="removeChangeBus(scope.$index, scope.row)"
+                >移除
               </el-button>
             </template>
           </el-table-column>
         </el-table>
-
       </el-descriptions-item>
-
     </el-descriptions>
 
+    <el-dialog
+      title="添加扫码单据类型"
+      :visible.sync="addBusToInDialogVisible"
+      width="55%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addBusToInDialogVisible"
+    >
+      <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+        <el-button type="primary" size="small" @click="addToInBusType()"
+          >选入</el-button
+        >
+      </div>
+      <el-table
+        :data="busTypes"
+        border
+        style="width: 100%"
+        @selection-change="handleToInCheckedChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="checkSelectable"
+        ></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+          label="单据类型"
+          prop="name"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          label="单据类型代码"
+          prop="action"
+          show-overflow-tooltip
+        ></el-table-column>
+      </el-table>
+
+      <el-pagination
+        :page-size="busQuery.limit"
+        @current-change="handleCurrentChange"
+        layout="prev, pager, next"
+        :total="total"
+        :current-page="busQuery.page"
+      ></el-pagination>
+    </el-dialog>
     <el-dialog
       title="添加扫码单据类型"
       :visible.sync="addBusDialogVisible"
@@ -278,9 +589,10 @@
       :close-on-press-escape="false"
       v-if="addBusDialogVisible"
     >
-
-      <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-        <el-button type="primary" size="small" @click="addBusType()">选入</el-button>
+      <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+        <el-button type="primary" size="small" @click="addBusType()"
+          >选入</el-button
+        >
       </div>
       <el-table
         :data="busTypes"
@@ -288,7 +600,11 @@
         style="width: 100%"
         @selection-change="handleCheckedChange"
       >
-        <el-table-column type="selection" width="55" :selectable="checkSelectable"></el-table-column>
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="checkSelectable"
+        ></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
           label="单据类型"
@@ -309,7 +625,6 @@
         :total="total"
         :current-page="busQuery.page"
       ></el-pagination>
-
     </el-dialog>
 
     <el-dialog
@@ -320,9 +635,10 @@
       :close-on-press-escape="false"
       v-if="addChangeBusDialogVisible"
     >
-
-      <div style="float: right;margin-bottom: 10px;margin-right: 25px">
-        <el-button type="primary" size="small" @click="addChangeBusType()">选入</el-button>
+      <div style="float: right; margin-bottom: 10px; margin-right: 25px">
+        <el-button type="primary" size="small" @click="addChangeBusType()"
+          >选入</el-button
+        >
       </div>
       <el-table
         :data="changeBusTypes"
@@ -330,7 +646,11 @@
         style="width: 100%"
         @selection-change="handleCheckedChangeBus"
       >
-        <el-table-column type="selection" width="55" :selectable="checkSelectableChange"></el-table-column>
+        <el-table-column
+          type="selection"
+          width="55"
+          :selectable="checkSelectableChange"
+        ></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
           label="单据类型"
@@ -351,16 +671,19 @@
         :total="changeBusTypeTotal"
         :current-page="changeBusQuery.page"
       ></el-pagination>
-
     </el-dialog>
   </el-card>
 </template>
 
 <script>
-import {findConfig, testConnect, updateConfig} from "@/api/sync/spsSyncStatus";
+import {
+  findConfig,
+  testConnect,
+  updateConfig,
+} from "@/api/sync/spsSyncStatus";
 import store from "@/store";
-import {getBussinessType} from "@/api/basic/bussinessType";
-import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
+import { getBussinessType } from "@/api/basic/bussinessType";
+import { getBusTypeChangeList } from "@/api/basic/busTypeChange";
 
 export default {
   name: "SysUdimsConfig",
@@ -387,18 +710,26 @@ export default {
         orderUnCheck: null,
         orderUnReceive: null,
         sysUser: null,
+        orderToInSyncTime: null,
         orderSyncTime: null,
         orderSyncDlTime: null,
         delaySyncTime: null,
         busTypes: [],
+        toInBusTypes: [],
         changeBusTypes: [],
         companyCert: null,
         manufacturerCert: null,
         productCert: null,
-
-
+        basicDept: null,
+        supCert: null,
+        systemConfig: null,
+        entrustAction: null,
+        printConfig: null,
+        scanChangeConfig: null,
+        busChangeConfig: null,
       },
       checkedBusTypes: [],
+      checkedToInBusTypes: [],
       checkedChangeBusTypes: [],
       busQuery: {
         page: 1,
@@ -406,7 +737,9 @@ export default {
       },
       busTypes: [],
       multipleSelection: [],
+      toInSelecttions: [],
       addBusDialogVisible: false,
+      addBusToInDialogVisible: false,
       total: 0,
       testLoading: false,
       addChangeBusDialogVisible: false,
@@ -416,69 +749,54 @@ export default {
       },
       changeBusTypeTotal: 0,
       changeBusTypes: [],
-      changeBusTypeSelection: []
-    }
+      changeBusTypeSelection: [],
+    };
   },
   methods: {
     getConfig() {
       findConfig()
         .then((response) => {
-
           this.configQuery = response.data;
           this.checkedBusTypes = this.configQuery.busTypes;
+          this.checkedToInBusTypes = this.configQuery.toInBusTypes;
           this.checkedChangeBusTypes = this.configQuery.changeBusTypes;
-          if (this.configQuery.busTypes != null) {
-            // for (let i = 0; i < this.configQuery.busTypes.length; i++) {
-            //
-            //     for (let k = 0; k < this.busTypes.length; k++) {
-            //         if (this.busTypes[k].action == this.configQuery.busTypes[i]) {
-            //             this.checkedBusTypes.push(this.busTypes[k]);
-            //             this.busTypes[k].isSelect = true;
-            //         }
-            //     }
-            // }
-          } else {
-            this.$message.error(response.message);
-          }
         })
         .catch(() => {
           this.loading = false;
-          this.list = [];
-          this.total = 0;
         });
     },
     saveConfig() {
-
-      this.$confirm('是否确认修改?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
+      this.$confirm("是否确认修改?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
         center: true,
-      }).then(() => {
-        if (this.checkedBusTypes != null) {
-          this.configQuery.busTypes = this.checkedBusTypes;
-          // for (let i = 0; i < this.checkedBusTypes.length; i++) {
-          //     this.configQuery.busTypes.push(this.checkedBusTypes);
-          // }
-        }
-        if (this.checkedChangeBusTypes != null) {
-          this.configQuery.changeBusTypes = this.checkedChangeBusTypes;
-        }
-        updateConfig(this.configQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.$message.success("修改成功！");
-              this.getConfig();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-      }).catch(() => {
-      });
+      })
+        .then(() => {
+          if (this.checkedBusTypes != null) {
+            this.configQuery.busTypes = this.checkedBusTypes;
+          }
+          if (this.checkedChangeBusTypes != null) {
+            this.configQuery.changeBusTypes = this.checkedChangeBusTypes;
+          }
+          if (this.checkedToInBusTypes != null) {
+            this.configQuery.toInBusTypes = this.checkedToInBusTypes;
+          }
+          updateConfig(this.configQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("修改成功！");
+                this.getConfig();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {});
     },
 
     testConnect() {
@@ -495,23 +813,23 @@ export default {
         .catch(() => {
           this.testLoading = false;
         });
-
-
     },
 
     handleCheckedChange(val) {
       this.multipleSelection = val;
     },
 
+    handleToInCheckedChange(val) {
+      this.toInSelecttions = val;
+    },
+
     getBusType() {
       getBussinessType(this.busQuery)
         .then((response) => {
           this.busTypes = response.data.list || [];
           this.total = response.data.total || 0;
-          // this.getConfig();
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
 
     addBusTypeDialog() {
@@ -519,10 +837,33 @@ export default {
       this.multipleSelection = [];
     },
 
+    addToInBusTypeDialog() {
+      this.addBusToInDialogVisible = true;
+      this.toInSelecttions = [];
+    },
+
+    addToInBusType() {
+      var selectData = this.toInSelecttions;
+      selectData.forEach((obj) => {
+        obj.outChange = false;
+        obj.orderStatus = 7;
+        obj.direct = 2;
+        let isPut = true;
+        for (let i = 0; i < this.checkedToInBusTypes.length; i++) {
+          if (this.checkedToInBusTypes[i].action == obj.action) {
+            isPut = false;
+          }
+        }
+        if (isPut) this.checkedToInBusTypes.push(obj);
+      });
+      this.addBusToInDialogVisible = false;
+    },
+
     addBusType() {
       var selectData = this.multipleSelection;
       selectData.forEach((obj) => {
         obj.outChange = false;
+        obj.direct = 1;
         obj.orderStatus = 7;
         let isPut = true;
         for (let i = 0; i < this.checkedBusTypes.length; i++) {
@@ -530,14 +871,18 @@ export default {
             isPut = false;
           }
         }
-        if (isPut)
-          this.checkedBusTypes.push(obj);
+        if (isPut) this.checkedBusTypes.push(obj);
       });
       this.addBusDialogVisible = false;
     },
     remveBus(index, row) {
       this.checkedBusTypes.splice(index, 1);
     },
+
+    removeToInBus(index, row) {
+      this.checkedToInBusTypes.splice(index, 1);
+    },
+
     checkSelectable(row) {
       return !row.isSelect;
     },
@@ -556,8 +901,7 @@ export default {
             isPut = false;
           }
         }
-        if (isPut)
-          this.checkedChangeBusTypes.push(obj);
+        if (isPut) this.checkedChangeBusTypes.push(obj);
       });
       this.addChangeBusDialogVisible = false;
     },
@@ -572,13 +916,13 @@ export default {
           res.data.list.forEach((item) => {
             let changeBusType = {
               action: item.originAction,
-              name: item.originName
+              name: item.originName,
             };
             this.changeBusTypes.push(changeBusType);
           });
         }
         this.changeBusTypeTotal = res.data.total || 0;
-      })
+      });
     },
     handleCurrentChangePage(val) {
       this.changeBusQuery.page = val;
@@ -604,9 +948,11 @@ export default {
     this.getChangeBusType();
     this.getConfig();
   },
-}
+};
 </script>
 
 <style scoped>
-
+/deep/ .el-select {
+  width: 100px;
+}
 </style>
diff --git a/src/views/system/print/pdfBizPrintSet.vue b/src/views/system/print/pdfBizPrintSet.vue
new file mode 100644
index 00000000..cc47298b
--- /dev/null
+++ b/src/views/system/print/pdfBizPrintSet.vue
@@ -0,0 +1,759 @@
+<template>
+  <div>
+
+      <el-form
+        :inline="true"
+        :model="moduleQuery"
+        class="query-form"
+        size="mini"
+      >
+        <el-row>
+          <el-form-item class="query-form-item" label="功能名称:">
+            <el-input v-model="moduleQuery.name" placeholder="功能名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button-group>
+              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+          <el-table v-loading="moduleLoading" :data="moduleList" style="width: 100%" border @row-click="moduleClick" highlight-current-row>
+            <el-table-column type="index" label="序号" width="50"></el-table-column>
+            <el-table-column label="功能名称" prop="name"></el-table-column>
+            <el-table-column label="备注" prop="remark"></el-table-column>
+            <el-table-column label="操作" width="250">
+              <template slot-scope="scope">
+                <el-button type="text" @click.native="showFieldExpain(scope.row)">字段说明</el-button>
+                <el-button type="text" @click="jumpDl(scope.row)">初始模板下载</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="moduleTotal>0"
+            :total="moduleTotal"
+            :page.sync="moduleQuery.page"
+            :limit.sync="moduleQuery.limit"
+            @pagination="getList"
+          />
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%;margin-top: 50px" border>
+        <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="业务类型" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="模板名称" width="200">
+          <template slot-scope="scope">
+            <p v-if="scope.row.templateName === null">
+              <el-button
+                type="primary"
+                size="mini"
+                @click.native.stop="busSelectTemplate(scope.row)"
+              >选择模板
+              </el-button
+              >
+            </p>
+            <p v-if="scope.row.templateName !== null">
+              <el-button
+                type="primary"
+                size="mini"
+                @click.native.stop="busSelectTemplate(scope.row)"
+              >{{ scope.row.templateName }}
+              </el-button
+              >
+            </p>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
+                      placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注字段2" prop="remark1" show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark2"
+                      placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
+                      placeholder="请输入"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150" prop="price">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="handleEdit(scope.$index, scope.row)"
+            >编辑
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="handleSave(scope.$index, scope.row)"
+            >保存
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="query.page"
+        :limit.sync="query.limit"
+        @pagination="getList"
+      />
+      <div style="margin-top: 18px ;  color: #F71616; font-size: 13px">
+        <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+      </div>
+    <!--表单-->
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="hideForm"
+      width="85%"
+      top="5vh"
+    >
+      <el-form :model="formData" :rules="formRules" ref="dataForm">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <div class="ao-text">
+              <span>选择jasper模板：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="">
+              <el-upload
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jasper"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :auto-upload="false">
+                <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
+                </el-button>
+                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
+                <div slot="tip" class="el-upload__tip">只能上传 jasper 文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <div class="ao-text">
+              <span>所属模块：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="module">
+              <el-select v-model="formData.module" placeholder="所属模块">
+                <el-option
+                  v-for="item in moduleNameList"
+                  :key="item.idStr"
+                  :label="item.name"
+                  :value="item.idStr"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="hideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="submitUpload()"
+          :loading="formLoading"
+        >提交
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <!--    模块选择模板    -->
+    <el-dialog
+      title="选择模板"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="moduleFormVisible"
+      :before-close="moduleHideForm"
+      width="70%"
+      top="5vh"
+    >
+      <el-form ref="singleTable">
+        <el-table v-loading="selectTemplateLoading" :data="selectTemplateList" style="width: 100%"
+                  highlight-current-row
+                  border
+                  @current-change="moduleSelectHandleCurrentChange">
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column label="模板名称" prop="name" width="200"></el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+        </el-table>
+
+        <el-pagination
+          :page-size="selectTemplateQuery.limit"
+          @current-change="selectTemplateGetList"
+          layout="prev, pager, next"
+          :total="selectTemplateTotal"
+          :current-page="selectTemplateQuery.page"
+        >
+        </el-pagination>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="moduleHideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="moduleSubmitSelectTemplate()"
+          :loading="moduleFormLoading"
+        >确定
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="字段说明"
+      :visible.sync="centerDialogVisible"
+      width="40%"
+      center>
+      <span style="white-space: pre-wrap;">{{ currentRow }}</span>
+      <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  systemPDFTemplateList,
+  systemPDFTemplateSave,
+  systemPDFTemplateDeleteById,
+  systemPDFModuleList,
+  systemPDFModuleSave, updateDetailRel,
+  getSystemPDFModules, moduleDetail, updatePdfRelData, moduleBizDetail
+} from '@/api/system/systemPDFTemplate'
+import {saveAs} from 'file-saver';
+
+const formJson = {
+  id: "",
+  name: "",
+  type: "2",
+  module: "1",
+  param: "",
+  path: "",
+  rowCount: 10,
+  qrcodeCount: 1,
+  remark: "",
+};
+const moduleFormJson = {
+  id: "",
+  templateId: 0,
+};
+export default {
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      query: {
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      headers: {},
+      list: [],
+      total: 0,
+      moduleQuery: {
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      currentRow: null,
+      moduleList: [],
+      moduleNameList: [],
+      moduleTotal: 0,
+      selectTemplateQuery: {
+        busRlId: null,
+        name: "",
+        module: null,
+        page: 1,
+        limit: 10
+      },
+      centerDialogVisible: false,
+      selectTemplateList: [],
+      selectTemplateTotal: 0,
+      selectTemplateLoading: false,
+      moduleSelectQuery: {
+        name: "",
+        page: 1,
+        limit: 10
+      },
+      moduleSelectList: [],
+      moduleSelectTotal: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      moduleFormName: null,
+      formMap: {
+        add: "新增",
+        update: "设置"
+      },
+      formLoading: false,
+      formVisible: false,
+      moduleFormLoading: false,
+      moduleFormVisible: false,
+      formData: formJson,
+      moduleFormData: moduleFormJson,
+      formRules: {
+        name: [
+          {required: true, message: "请输入模板名称", trigger: "blur"}
+        ],
+        module: [
+          {required: true, message: "请选择所属模块", trigger: "blur"}
+        ]
+      },
+      currentCheckIndex: -1,
+      deleteLoading: false,
+      uploadUrl: "",
+      fileList: [],
+      uploadDisabled: false,
+      moduleLoading: false,
+      moduleTypeMap: {0: "标签", 1: "报表", 2: "单据"},
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.moduleQuery = {
+        templateType: null,
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.getModuleList();
+    },
+    onSubmit() {
+      this.getModuleList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+    moduleHandleCurrentChange(val) {
+      this.selectTemplateQuery.page = val;
+      this.selectTemplateGetList();
+    },
+    getList() {
+      // this.loading = true;
+      moduleBizDetail(this.query)
+        .then(response => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
+    handleSubCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+
+    moduleClick(row) {
+      debugger
+      this.query = {
+        modelKey: row.modelKey,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+
+    handleDownload(url, name) {
+      this.getBlob(url).then(blob => {
+        saveAs(blob, name);
+      })
+      return false;
+    },
+    getBlob(url) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+          if (xhr.status === 200) {
+            resolve(xhr.response);
+          }
+        };
+        xhr.send();
+      })
+    },
+
+    jumpDl(row) {
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+    },
+    getModuleList() {
+      this.moduleLoading = true;
+      this.moduleQuery.templateType=2
+      systemPDFModuleList(this.moduleQuery)
+        .then(response => {
+          this.moduleLoading = false;
+          this.moduleList = response.data.list || [];
+          this.moduleTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.moduleLoading = false;
+          this.moduleList = [];
+          this.moduleTotal = 0;
+        });
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    // 隐藏表单
+    hideForm() {
+      // 更改值
+      this.formVisible = !this.formVisible;
+      return true;
+    },
+    moduleHideForm() {
+      this.moduleFormVisible = !this.moduleFormVisible;
+      this.selectTemplateQuery.module = null;
+      return true;
+    },
+    moduleSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.selectTemplateGetList();
+    },
+
+    busSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        busRlId: row.id,
+        type: 1,
+        name: "",
+        page: 1,
+        limit: 10
+      };
+
+      this.selectTemplateGetList();
+    },
+
+
+    selectTemplateGetList(val) {
+      this.selectTemplateLoading = true;
+      if (val != null) {
+        this.selectTemplateQuery.page = val;
+      }
+      systemPDFTemplateList(this.selectTemplateQuery)
+        .then(response => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = response.data.list || [];
+          this.selectTemplateTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = [];
+          this.selectTemplateTotal = 0;
+        });
+    },
+    showFieldExpain(row) {
+      this.currentRow = row.fieldExplain.replace('\\\n', '<br>');
+      this.centerDialogVisible = true;
+      // const {href} = this.$router.resolve({//打开新窗口页面
+      //     path: '/showText',
+      //     query: {
+      //         content: row.fieldExplain
+      //     }
+      // })
+      // window.open(href, '_blank')
+    },
+    // 显示表单
+    handleForm(index, row) {
+      this.formVisible = true;
+      this.formData = JSON.parse(JSON.stringify(formJson));
+      this.fileList = [];
+      if (row !== null) {
+        this.formData = Object.assign({}, row);
+        this.formData.module = row.module + "";
+      }
+      this.index = index;
+      this.formName = "update";
+      this.uploadDisabled = true;
+    },
+
+
+    handleAddForm(row) {
+      this.formVisible = true;
+      this.formData = {module: row.id + ""};
+      this.fileList = [];
+      this.formName = "add";
+      this.uploadDisabled = false;
+    },
+    templateConfig(row) {
+
+    },
+    submitUpload() {
+      if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) {
+        this.$message.warning(`请选择jasper文件`);
+      }
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (!this.uploadDisabled) {
+            this.$refs.upload.submit();
+          } else {
+            this.submitTemplate();
+          }
+        }
+      });
+    },
+    uploadHandleRemove(file, fileList) {
+    },
+    uploadHandlePreview(file) {
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jasper") {
+        this.$message.error("上传文件只能是 jasper 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.formData.path = response.data.path;
+        this.submitTemplate();
+      } else {
+        this.$message.error("上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    submitTemplate() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.formLoading = true;
+          let data = Object.assign({}, this.formData);
+          data.name = data.name.trim();
+          systemPDFTemplateSave(data, this.formName)
+            .then(response => {
+              this.formLoading = false;
+              if (response.code !== 20000) {
+                this.$message.error(response.message);
+                return false;
+              }
+              this.$message.success("操作成功");
+              this.formVisible = false;
+              if (this.formName === "add") {
+                // 向头部添加数据
+                if (response.data && response.data.id) {
+                  data.id = response.data.id;
+                  this.list.unshift(data);
+                }
+              } else {
+                this.list.splice(this.index, 1, data);
+              }
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+              this.getModuleList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    deleteTemplate(row) {
+      this.$confirm("此操作将永久删除该模板, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        systemPDFTemplateDeleteById({id: row.id, path: row.path})
+          .then(response => {
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+
+          })
+      }).catch(() => {
+
+      });
+    },
+    moduleSelectSetCurrent(row) {
+      this.$refs.singleTable.setCurrentRow(row);
+    },
+    moduleSelectHandleCurrentChange(val) {
+      this.moduleFormData.templateId = val.id;
+    },
+    moduleSubmitSelectTemplate() {
+
+      this.moduleFormLoading = true;
+      let data = Object.assign({}, this.moduleFormData);
+      this.moduleFormName = 'update';
+      if (this.selectTemplateQuery.type == 1) {
+
+
+        let query = {
+          id: this.selectTemplateQuery.busRlId,
+          templateId: data.templateId,
+        }
+        updateDetailRel(query)
+          .then(response => {
+            this.moduleFormVisible = false;
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.getList();
+          }).catch(() => {
+          this.moduleFormLoading = false;
+        });
+      } else
+        systemPDFModuleSave(data, this.moduleFormName)
+          .then(response => {
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.$message.success("操作成功");
+            this.moduleFormVisible = false;
+            if (this.moduleFormName === "add") {
+              // 向头部添加数据
+              if (response.data && response.data.id) {
+                data.id = response.data.id;
+                this.moduleList.unshift(data);
+              }
+            } else {
+              this.moduleList.splice(this.index, 1, data);
+            }
+            this.getModuleList();
+          })
+          .catch(() => {
+            this.moduleFormLoading = false;
+          });
+    },
+
+    handleEdit(index, row) {
+      this.currentCheckIndex = index;
+    },
+    handleSave(index, row) {
+      this.currentCheckIndex = -1;
+      updateDetailRel(row).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success(res.data);
+        }
+      })
+    },
+
+  },
+  filters: {
+    paramStatusFilterType(paramStatus) {
+      const paramStatusTypeMap = {
+        0: "gray",
+        1: "success"
+      };
+      return paramStatusTypeMap[paramStatus];
+    },
+    paramStatusFilterName(paramStatus) {
+      const paramStatusNameMap = {
+        1: "订单详情",
+        2: "配货管理-打印订单"
+      };
+      return paramStatusNameMap[paramStatus];
+    }
+  },
+  mounted() {
+  },
+  created() {
+    this.getModuleList();
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+  }
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/system/print/pdfCodePrintSet.vue b/src/views/system/print/pdfCodePrintSet.vue
new file mode 100644
index 00000000..83e938c9
--- /dev/null
+++ b/src/views/system/print/pdfCodePrintSet.vue
@@ -0,0 +1,759 @@
+<template>
+  <div>
+
+    <el-form
+      :inline="true"
+      :model="moduleQuery"
+      class="query-form"
+      size="mini"
+    >
+      <el-row>
+        <el-form-item class="query-form-item" label="功能名称:">
+          <el-input v-model="moduleQuery.name" placeholder="功能名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <el-table v-loading="moduleLoading" :data="moduleList" style="width: 100%" border @row-click="moduleClick" highlight-current-row>
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column label="功能名称" prop="name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+      <el-table-column label="操作" width="250">
+        <template slot-scope="scope">
+          <el-button type="text" @click.native="showFieldExpain(scope.row)">字段说明</el-button>
+          <el-button type="text" @click="jumpDl(scope.row)">初始模板下载</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="moduleTotal>0"
+      :total="moduleTotal"
+      :page.sync="moduleQuery.page"
+      :limit.sync="moduleQuery.limit"
+      @pagination="getList"
+    />
+
+
+    <el-table v-loading="loading" :data="list" style="width: 100%;margin-top: 50px" border>
+      <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="业务类型" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="模板名称" width="200">
+        <template slot-scope="scope">
+          <p v-if="scope.row.templateName === null">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="busSelectTemplate(scope.row)"
+            >选择模板
+            </el-button
+            >
+          </p>
+          <p v-if="scope.row.templateName !== null">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="busSelectTemplate(scope.row)"
+            >{{ scope.row.templateName }}
+            </el-button
+            >
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段2" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark2"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="150" prop="price">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            @click="handleEdit(scope.$index, scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            type="text"
+            size="small"
+            @click="handleSave(scope.$index, scope.row)"
+          >保存
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="query.page"
+      :limit.sync="query.limit"
+      @pagination="getList"
+    />
+    <div style="margin-top: 18px ;  color: #F71616; font-size: 13px">
+      <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+    </div>
+    <!--表单-->
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="hideForm"
+      width="85%"
+      top="5vh"
+    >
+      <el-form :model="formData" :rules="formRules" ref="dataForm">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <div class="ao-text">
+              <span>选择jasper模板：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="">
+              <el-upload
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jasper"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :auto-upload="false">
+                <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
+                </el-button>
+                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
+                <div slot="tip" class="el-upload__tip">只能上传 jasper 文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <div class="ao-text">
+              <span>所属模块：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="module">
+              <el-select v-model="formData.module" placeholder="所属模块">
+                <el-option
+                  v-for="item in moduleNameList"
+                  :key="item.idStr"
+                  :label="item.name"
+                  :value="item.idStr"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="hideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="submitUpload()"
+          :loading="formLoading"
+        >提交
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <!--    模块选择模板    -->
+    <el-dialog
+      title="选择模板"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="moduleFormVisible"
+      :before-close="moduleHideForm"
+      width="70%"
+      top="5vh"
+    >
+      <el-form ref="singleTable">
+        <el-table v-loading="selectTemplateLoading" :data="selectTemplateList" style="width: 100%"
+                  highlight-current-row
+                  border
+                  @current-change="moduleSelectHandleCurrentChange">
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column label="模板名称" prop="name" width="200"></el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+        </el-table>
+
+        <el-pagination
+          :page-size="selectTemplateQuery.limit"
+          @current-change="selectTemplateGetList"
+          layout="prev, pager, next"
+          :total="selectTemplateTotal"
+          :current-page="selectTemplateQuery.page"
+        >
+        </el-pagination>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="moduleHideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="moduleSubmitSelectTemplate()"
+          :loading="moduleFormLoading"
+        >确定
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="字段说明"
+      :visible.sync="centerDialogVisible"
+      width="40%"
+      center>
+      <span style="white-space: pre-wrap;">{{ currentRow }}</span>
+      <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  systemPDFTemplateList,
+  systemPDFTemplateSave,
+  systemPDFTemplateDeleteById,
+  systemPDFModuleList,
+  systemPDFModuleSave, updateDetailRel,
+  getSystemPDFModules, moduleDetail, updatePdfRelData, moduleBizDetail, moduleCodeDetail, updateCodeDetailRel
+} from '@/api/system/systemPDFTemplate'
+import {saveAs} from 'file-saver';
+
+const formJson = {
+  id: "",
+  name: "",
+  type: "2",
+  module: "1",
+  param: "",
+  path: "",
+  rowCount: 10,
+  qrcodeCount: 1,
+  remark: "",
+};
+const moduleFormJson = {
+  id: "",
+  templateId: 0,
+};
+export default {
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      query: {
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      headers: {},
+      list: [],
+      total: 0,
+      moduleQuery: {
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      currentRow: null,
+      moduleList: [],
+      moduleNameList: [],
+      moduleTotal: 0,
+      selectTemplateQuery: {
+        busRlId: null,
+        name: "",
+        module: null,
+        page: 1,
+        limit: 10
+      },
+      centerDialogVisible: false,
+      selectTemplateList: [],
+      selectTemplateTotal: 0,
+      selectTemplateLoading: false,
+      moduleSelectQuery: {
+        name: "",
+        page: 1,
+        limit: 10
+      },
+      moduleSelectList: [],
+      moduleSelectTotal: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      moduleFormName: null,
+      formMap: {
+        add: "新增",
+        update: "设置"
+      },
+      formLoading: false,
+      formVisible: false,
+      moduleFormLoading: false,
+      moduleFormVisible: false,
+      formData: formJson,
+      moduleFormData: moduleFormJson,
+      formRules: {
+        name: [
+          {required: true, message: "请输入模板名称", trigger: "blur"}
+        ],
+        module: [
+          {required: true, message: "请选择所属模块", trigger: "blur"}
+        ]
+      },
+      currentCheckIndex: -1,
+      deleteLoading: false,
+      uploadUrl: "",
+      fileList: [],
+      uploadDisabled: false,
+      moduleLoading: false,
+      moduleTypeMap: {0: "标签", 1: "报表", 2: "单据"},
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.moduleQuery = {
+        templateType: null,
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.getModuleList();
+    },
+    onSubmit() {
+      this.getModuleList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+    moduleHandleCurrentChange(val) {
+      this.selectTemplateQuery.page = val;
+      this.selectTemplateGetList();
+    },
+    getList() {
+      // this.loading = true;
+      moduleCodeDetail(this.query)
+        .then(response => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
+    handleSubCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+
+    moduleClick(row) {
+      this.query = {
+        modelKey: row.modelKey,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+
+    handleDownload(url, name) {
+      this.getBlob(url).then(blob => {
+        saveAs(blob, name);
+      })
+      return false;
+    },
+    getBlob(url) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+          if (xhr.status === 200) {
+            resolve(xhr.response);
+          }
+        };
+        xhr.send();
+      })
+    },
+
+    jumpDl(row) {
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+    },
+    getModuleList() {
+      this.moduleLoading = true;
+      this.moduleQuery.templateType=3
+      systemPDFModuleList(this.moduleQuery)
+        .then(response => {
+          this.moduleLoading = false;
+          this.moduleList = response.data.list || [];
+          this.moduleTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.moduleLoading = false;
+          this.moduleList = [];
+          this.moduleTotal = 0;
+        });
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    // 隐藏表单
+    hideForm() {
+      // 更改值
+      this.formVisible = !this.formVisible;
+      return true;
+    },
+    moduleHideForm() {
+      this.moduleFormVisible = !this.moduleFormVisible;
+      this.selectTemplateQuery.module = null;
+      return true;
+    },
+    moduleSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.selectTemplateGetList();
+    },
+
+    busSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        busRlId: row.id,
+        type: 1,
+        name: "",
+        page: 1,
+        limit: 10
+      };
+
+      this.selectTemplateGetList();
+    },
+
+
+    selectTemplateGetList(val) {
+      this.selectTemplateLoading = true;
+      if (val != null) {
+        this.selectTemplateQuery.page = val;
+      }
+      systemPDFTemplateList(this.selectTemplateQuery)
+        .then(response => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = response.data.list || [];
+          this.selectTemplateTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = [];
+          this.selectTemplateTotal = 0;
+        });
+    },
+    showFieldExpain(row) {
+
+      this.currentRow = row.fieldExplain.replace('\\\n', '<br>');
+      this.centerDialogVisible = true;
+      // const {href} = this.$router.resolve({//打开新窗口页面
+      //     path: '/showText',
+      //     query: {
+      //         content: row.fieldExplain
+      //     }
+      // })
+      // window.open(href, '_blank')
+    },
+    // 显示表单
+    handleForm(index, row) {
+      this.formVisible = true;
+      this.formData = JSON.parse(JSON.stringify(formJson));
+      this.fileList = [];
+      if (row !== null) {
+        this.formData = Object.assign({}, row);
+        this.formData.module = row.module + "";
+      }
+      this.index = index;
+      this.formName = "update";
+      this.uploadDisabled = true;
+    },
+
+
+    handleAddForm(row) {
+      this.formVisible = true;
+      this.formData = {module: row.id + ""};
+      this.fileList = [];
+      this.formName = "add";
+      this.uploadDisabled = false;
+    },
+    templateConfig(row) {
+
+    },
+    submitUpload() {
+      if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) {
+        this.$message.warning(`请选择jasper文件`);
+      }
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (!this.uploadDisabled) {
+            this.$refs.upload.submit();
+          } else {
+            this.submitTemplate();
+          }
+        }
+      });
+    },
+    uploadHandleRemove(file, fileList) {
+    },
+    uploadHandlePreview(file) {
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jasper") {
+        this.$message.error("上传文件只能是 jasper 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.formData.path = response.data.path;
+        this.submitTemplate();
+      } else {
+        this.$message.error("上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    submitTemplate() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.formLoading = true;
+          let data = Object.assign({}, this.formData);
+          data.name = data.name.trim();
+          systemPDFTemplateSave(data, this.formName)
+            .then(response => {
+              this.formLoading = false;
+              if (response.code !== 20000) {
+                this.$message.error(response.message);
+                return false;
+              }
+              this.$message.success("操作成功");
+              this.formVisible = false;
+              if (this.formName === "add") {
+                // 向头部添加数据
+                if (response.data && response.data.id) {
+                  data.id = response.data.id;
+                  this.list.unshift(data);
+                }
+              } else {
+                this.list.splice(this.index, 1, data);
+              }
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+              this.getModuleList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    deleteTemplate(row) {
+      this.$confirm("此操作将永久删除该模板, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        systemPDFTemplateDeleteById({id: row.id, path: row.path})
+          .then(response => {
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+
+          })
+      }).catch(() => {
+
+      });
+    },
+    moduleSelectSetCurrent(row) {
+      this.$refs.singleTable.setCurrentRow(row);
+    },
+    moduleSelectHandleCurrentChange(val) {
+      this.moduleFormData.templateId = val.id;
+    },
+    moduleSubmitSelectTemplate() {
+
+      this.moduleFormLoading = true;
+      let data = Object.assign({}, this.moduleFormData);
+      this.moduleFormName = 'update';
+      if (this.selectTemplateQuery.type == 1) {
+
+
+        let query = {
+          id: this.selectTemplateQuery.busRlId,
+          templateId: data.templateId,
+        }
+        updateCodeDetailRel(query)
+          .then(response => {
+            this.moduleFormVisible = false;
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.getList();
+          }).catch(() => {
+          this.moduleFormLoading = false;
+        });
+      } else
+        systemPDFModuleSave(data, this.moduleFormName)
+          .then(response => {
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.$message.success("操作成功");
+            this.moduleFormVisible = false;
+            if (this.moduleFormName === "add") {
+              // 向头部添加数据
+              if (response.data && response.data.id) {
+                data.id = response.data.id;
+                this.moduleList.unshift(data);
+              }
+            } else {
+              this.moduleList.splice(this.index, 1, data);
+            }
+            this.getModuleList();
+          })
+          .catch(() => {
+            this.moduleFormLoading = false;
+          });
+    },
+
+    handleEdit(index, row) {
+      this.currentCheckIndex = index;
+    },
+    handleSave(index, row) {
+      this.currentCheckIndex = -1;
+      updateCodeDetailRel(row).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success(res.data);
+        }
+      })
+    },
+
+  },
+  filters: {
+    paramStatusFilterType(paramStatus) {
+      const paramStatusTypeMap = {
+        0: "gray",
+        1: "success"
+      };
+      return paramStatusTypeMap[paramStatus];
+    },
+    paramStatusFilterName(paramStatus) {
+      const paramStatusNameMap = {
+        1: "订单详情",
+        2: "配货管理-打印订单"
+      };
+      return paramStatusNameMap[paramStatus];
+    }
+  },
+  mounted() {
+  },
+  created() {
+    this.getModuleList();
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+  }
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/system/print/pdfLabelPrintSet.vue b/src/views/system/print/pdfLabelPrintSet.vue
new file mode 100644
index 00000000..55286b29
--- /dev/null
+++ b/src/views/system/print/pdfLabelPrintSet.vue
@@ -0,0 +1,758 @@
+<template>
+  <div>
+
+    <el-form
+      :inline="true"
+      :model="moduleQuery"
+      class="query-form"
+      size="mini"
+    >
+      <el-row>
+        <el-form-item class="query-form-item" label="功能名称:">
+          <el-input v-model="moduleQuery.name" placeholder="功能名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <el-table v-loading="moduleLoading" :data="moduleList" style="width: 100%" border @row-click="moduleClick" highlight-current-row>
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column label="功能名称" prop="name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+      <el-table-column label="操作" width="250">
+        <template slot-scope="scope">
+          <el-button type="text" @click.native="showFieldExpain(scope.row)">字段说明</el-button>
+          <el-button type="text" @click="jumpDl(scope.row)">初始模板下载</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="moduleTotal>0"
+      :total="moduleTotal"
+      :page.sync="moduleQuery.page"
+      :limit.sync="moduleQuery.limit"
+      @pagination="getList"
+    />
+
+
+    <el-table v-loading="loading" :data="list" style="width: 100%;margin-top: 50px" border>
+      <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="功能名称" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="模板名称" width="200">
+        <template slot-scope="scope">
+          <p v-if="scope.row.templateName === null">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="busSelectTemplate(scope.row)"
+            >选择模板
+            </el-button
+            >
+          </p>
+          <p v-if="scope.row.templateName !== null">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="busSelectTemplate(scope.row)"
+            >{{ scope.row.templateName }}
+            </el-button
+            >
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段2" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark2"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="150" prop="price">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            @click="handleEdit(scope.$index, scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            type="text"
+            size="small"
+            @click="handleSave(scope.$index, scope.row)"
+          >保存
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="query.page"
+      :limit.sync="query.limit"
+      @pagination="getList"
+    />
+    <div style="margin-top: 18px ;  color: #F71616; font-size: 13px">
+      <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+    </div>
+    <!--表单-->
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="hideForm"
+      width="85%"
+      top="5vh"
+    >
+      <el-form :model="formData" :rules="formRules" ref="dataForm">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <div class="ao-text">
+              <span>选择jasper模板：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="">
+              <el-upload
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jasper"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :auto-upload="false">
+                <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
+                </el-button>
+                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
+                <div slot="tip" class="el-upload__tip">只能上传 jasper 文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <div class="ao-text">
+              <span>所属模块：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="module">
+              <el-select v-model="formData.module" placeholder="所属模块">
+                <el-option
+                  v-for="item in moduleNameList"
+                  :key="item.idStr"
+                  :label="item.name"
+                  :value="item.idStr"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="hideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="submitUpload()"
+          :loading="formLoading"
+        >提交
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <!--    模块选择模板    -->
+    <el-dialog
+      title="选择模板"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="moduleFormVisible"
+      :before-close="moduleHideForm"
+      width="70%"
+      top="5vh"
+    >
+      <el-form ref="singleTable">
+        <el-table v-loading="selectTemplateLoading" :data="selectTemplateList" style="width: 100%"
+                  highlight-current-row border
+                  @current-change="moduleSelectHandleCurrentChange">
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column label="模板名称" prop="name" width="200"></el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+        </el-table>
+
+        <el-pagination
+          :page-size="selectTemplateQuery.limit"
+          @current-change="selectTemplateGetList"
+          layout="prev, pager, next"
+          :total="selectTemplateTotal"
+          :current-page="selectTemplateQuery.page"
+        >
+        </el-pagination>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="moduleHideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="moduleSubmitSelectTemplate()"
+          :loading="moduleFormLoading"
+        >确定
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="字段说明"
+      :visible.sync="centerDialogVisible"
+      width="40%"
+      center>
+      <span style="white-space: pre-wrap;">{{ currentRow }}</span>
+      <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  systemPDFTemplateList,
+  systemPDFTemplateSave,
+  systemPDFTemplateDeleteById,
+  systemPDFModuleList,
+  systemPDFModuleSave, updateDetailRel,
+  getSystemPDFModules, moduleDetail, updatePdfRelData, moduleBizDetail, updateLabelDetailRel, moduleLabelDetail
+} from '@/api/system/systemPDFTemplate'
+import {saveAs} from 'file-saver';
+
+const formJson = {
+  id: "",
+  name: "",
+  type: "2",
+  module: "1",
+  param: "",
+  path: "",
+  rowCount: 10,
+  qrcodeCount: 1,
+  remark: "",
+};
+const moduleFormJson = {
+  id: "",
+  templateId: 0,
+};
+export default {
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      query: {
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      headers: {},
+      list: [],
+      total: 0,
+      moduleQuery: {
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      currentRow: null,
+      moduleList: [],
+      moduleNameList: [],
+      moduleTotal: 0,
+      selectTemplateQuery: {
+        busRlId: null,
+        name: "",
+        module: null,
+        page: 1,
+        limit: 10
+      },
+      centerDialogVisible: false,
+      selectTemplateList: [],
+      selectTemplateTotal: 0,
+      selectTemplateLoading: false,
+      moduleSelectQuery: {
+        name: "",
+        page: 1,
+        limit: 10
+      },
+      moduleSelectList: [],
+      moduleSelectTotal: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      moduleFormName: null,
+      formMap: {
+        add: "新增",
+        update: "设置"
+      },
+      formLoading: false,
+      formVisible: false,
+      moduleFormLoading: false,
+      moduleFormVisible: false,
+      formData: formJson,
+      moduleFormData: moduleFormJson,
+      formRules: {
+        name: [
+          {required: true, message: "请输入模板名称", trigger: "blur"}
+        ],
+        module: [
+          {required: true, message: "请选择所属模块", trigger: "blur"}
+        ]
+      },
+      currentCheckIndex: -1,
+      deleteLoading: false,
+      uploadUrl: "",
+      fileList: [],
+      uploadDisabled: false,
+      moduleLoading: false,
+      moduleTypeMap: {0: "标签", 1: "报表", 2: "单据"},
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.moduleQuery = {
+        templateType: null,
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.getModuleList();
+    },
+    onSubmit() {
+      this.getModuleList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+    moduleHandleCurrentChange(val) {
+      this.selectTemplateQuery.page = val;
+      this.selectTemplateGetList();
+    },
+    getList() {
+      // this.loading = true;
+      moduleLabelDetail(this.query)
+        .then(response => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
+    handleSubCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+
+    moduleClick(row) {
+      this.query = {
+        modelKey: row.modelKey,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+
+    handleDownload(url, name) {
+      this.getBlob(url).then(blob => {
+        saveAs(blob, name);
+      })
+      return false;
+    },
+    getBlob(url) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+          if (xhr.status === 200) {
+            resolve(xhr.response);
+          }
+        };
+        xhr.send();
+      })
+    },
+
+    jumpDl(row) {
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+    },
+    getModuleList() {
+      this.moduleLoading = true;
+      this.moduleQuery.templateType=0
+      systemPDFModuleList(this.moduleQuery)
+        .then(response => {
+          this.moduleLoading = false;
+          this.moduleList = response.data.list || [];
+          this.moduleTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.moduleLoading = false;
+          this.moduleList = [];
+          this.moduleTotal = 0;
+        });
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    // 隐藏表单
+    hideForm() {
+      // 更改值
+      this.formVisible = !this.formVisible;
+      return true;
+    },
+    moduleHideForm() {
+      this.moduleFormVisible = !this.moduleFormVisible;
+      this.selectTemplateQuery.module = null;
+      return true;
+    },
+    moduleSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.selectTemplateGetList();
+    },
+
+    busSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        busRlId: row.id,
+        type: 1,
+        name: "",
+        page: 1,
+        limit: 10
+      };
+
+      this.selectTemplateGetList();
+    },
+
+
+    selectTemplateGetList(val) {
+      this.selectTemplateLoading = true;
+      if (val != null) {
+        this.selectTemplateQuery.page = val;
+      }
+      systemPDFTemplateList(this.selectTemplateQuery)
+        .then(response => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = response.data.list || [];
+          this.selectTemplateTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = [];
+          this.selectTemplateTotal = 0;
+        });
+    },
+    showFieldExpain(row) {
+
+      this.currentRow = row.fieldExplain.replace('\\\n', '<br>');
+      this.centerDialogVisible = true;
+      // const {href} = this.$router.resolve({//打开新窗口页面
+      //     path: '/showText',
+      //     query: {
+      //         content: row.fieldExplain
+      //     }
+      // })
+      // window.open(href, '_blank')
+    },
+    // 显示表单
+    handleForm(index, row) {
+      this.formVisible = true;
+      this.formData = JSON.parse(JSON.stringify(formJson));
+      this.fileList = [];
+      if (row !== null) {
+        this.formData = Object.assign({}, row);
+        this.formData.module = row.module + "";
+      }
+      this.index = index;
+      this.formName = "update";
+      this.uploadDisabled = true;
+    },
+
+
+    handleAddForm(row) {
+      this.formVisible = true;
+      this.formData = {module: row.id + ""};
+      this.fileList = [];
+      this.formName = "add";
+      this.uploadDisabled = false;
+    },
+    templateConfig(row) {
+
+    },
+    submitUpload() {
+      if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) {
+        this.$message.warning(`请选择jasper文件`);
+      }
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (!this.uploadDisabled) {
+            this.$refs.upload.submit();
+          } else {
+            this.submitTemplate();
+          }
+        }
+      });
+    },
+    uploadHandleRemove(file, fileList) {
+    },
+    uploadHandlePreview(file) {
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jasper") {
+        this.$message.error("上传文件只能是 jasper 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.formData.path = response.data.path;
+        this.submitTemplate();
+      } else {
+        this.$message.error("上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    submitTemplate() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.formLoading = true;
+          let data = Object.assign({}, this.formData);
+          data.name = data.name.trim();
+          systemPDFTemplateSave(data, this.formName)
+            .then(response => {
+              this.formLoading = false;
+              if (response.code !== 20000) {
+                this.$message.error(response.message);
+                return false;
+              }
+              this.$message.success("操作成功");
+              this.formVisible = false;
+              if (this.formName === "add") {
+                // 向头部添加数据
+                if (response.data && response.data.id) {
+                  data.id = response.data.id;
+                  this.list.unshift(data);
+                }
+              } else {
+                this.list.splice(this.index, 1, data);
+              }
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+              this.getModuleList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    deleteTemplate(row) {
+      this.$confirm("此操作将永久删除该模板, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        systemPDFTemplateDeleteById({id: row.id, path: row.path})
+          .then(response => {
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+
+          })
+      }).catch(() => {
+
+      });
+    },
+    moduleSelectSetCurrent(row) {
+      this.$refs.singleTable.setCurrentRow(row);
+    },
+    moduleSelectHandleCurrentChange(val) {
+      this.moduleFormData.templateId = val.id;
+    },
+    moduleSubmitSelectTemplate() {
+
+      this.moduleFormLoading = true;
+      let data = Object.assign({}, this.moduleFormData);
+      this.moduleFormName = 'update';
+      if (this.selectTemplateQuery.type == 1) {
+
+
+        let query = {
+          id: this.selectTemplateQuery.busRlId,
+          templateId: data.templateId,
+        }
+        updateLabelDetailRel(query)
+          .then(response => {
+            this.moduleFormVisible = false;
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.getList();
+          }).catch(() => {
+          this.moduleFormLoading = false;
+        });
+      } else
+        systemPDFModuleSave(data, this.moduleFormName)
+          .then(response => {
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.$message.success("操作成功");
+            this.moduleFormVisible = false;
+            if (this.moduleFormName === "add") {
+              // 向头部添加数据
+              if (response.data && response.data.id) {
+                data.id = response.data.id;
+                this.moduleList.unshift(data);
+              }
+            } else {
+              this.moduleList.splice(this.index, 1, data);
+            }
+            this.getModuleList();
+          })
+          .catch(() => {
+            this.moduleFormLoading = false;
+          });
+    },
+
+    handleEdit(index, row) {
+      this.currentCheckIndex = index;
+    },
+    handleSave(index, row) {
+      this.currentCheckIndex = -1;
+      updateDetailRel(row).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success(res.data);
+        }
+      })
+    },
+
+  },
+  filters: {
+    paramStatusFilterType(paramStatus) {
+      const paramStatusTypeMap = {
+        0: "gray",
+        1: "success"
+      };
+      return paramStatusTypeMap[paramStatus];
+    },
+    paramStatusFilterName(paramStatus) {
+      const paramStatusNameMap = {
+        1: "订单详情",
+        2: "配货管理-打印订单"
+      };
+      return paramStatusNameMap[paramStatus];
+    }
+  },
+  mounted() {
+  },
+  created() {
+    this.getModuleList();
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+  }
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/system/print/pdfPrintSet.vue b/src/views/system/print/pdfPrintSet.vue
index 1bbcdd71..8c8eb43f 100644
--- a/src/views/system/print/pdfPrintSet.vue
+++ b/src/views/system/print/pdfPrintSet.vue
@@ -1,418 +1,39 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form
-        :inline="true"
-        :model="moduleQuery"
-        class="query-form"
-        size="mini"
-      >
-        <el-row>
-          <el-form-item class="query-form-item" label="功能名称:">
-            <el-input v-model="moduleQuery.name" placeholder="功能名称"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table v-loading="moduleLoading" :data="moduleList" style="width: 100%" border
-                @row-click="moduleClick" highlight-current-row>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="模板类型" width="150" prop="templateType">
-          <template slot-scope="scope">
-            {{ moduleTypeMap[scope.row.templateType] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="功能名称" prop="name"></el-table-column>
-        <el-table-column label="模板名称" width="250">
-          <template slot-scope="scope">
-            <p v-if="scope.row.templateName === null">
-              <el-button
-                type="text"
-                :disabled="scope.row.templateType == 2"
-                @click.native.stop="moduleSelectTemplate(scope.row)"
-              >选择模板
-              </el-button
-              >
-            </p>
-            <p v-if="scope.row.templateName !== null">
-              <el-button
-                type="text"
-                :disabled="scope.row.templateType == 2"
-                @click.native.stop="moduleSelectTemplate(scope.row)"
-              >{{ scope.row.templateName }}
-              </el-button
-              >
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" prop="remark"></el-table-column>
-        <el-table-column label="操作" width="250">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              @click.native="showFieldExpain(scope.row)"
-            >字段说明
-            </el-button
-            >
-            <el-button
-              type="text"
-              @click="jumpDl(scope.row)"
-            >初始模板下载
-            </el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--      <el-pagination-->
-      <!--        :page-size="moduleQuery.limit"-->
-      <!--        @current-change="moduleHandleCurrentChange"-->
-      <!--        layout="prev, pager, next"-->
-      <!--        :total="moduleTotal"-->
-      <!--        :current-page="moduleQuery.page"-->
-      <!--      >-->
-      <!--      </el-pagination>-->
-      <pagination
-        v-show="moduleTotal>0"
-        :total="moduleTotal"
-        :page.sync="moduleQuery.page"
-        :limit.sync="moduleQuery.limit"
-        @pagination="getList"
-      />
+      <el-tabs type="border-card">
+        <el-tab-pane label="业务单模板">
+          <!-----------------------------------------------------------  业务模板代码 ------------------------------------------------------>
+          <bizModelDetail></bizModelDetail>
+        </el-tab-pane>
+        <el-tab-pane label="扫码单据模板">
+          <!-----------------------------------------------------------  扫码单据模板代码 ------------------------------------------------------>
+          <codeModelDetail></codeModelDetail>
+        </el-tab-pane>
+        <el-tab-pane label="标签模板" >
+          <!-----------------------------------------------------------  标签模板代码 ------------------------------------------------------>
+          <labelModelDetail></labelModelDetail>
+        </el-tab-pane>
+        <el-tab-pane label="报表模板">
+          <!-----------------------------------------------------------  报表模板代码 ------------------------------------------------------>
+          <statemenModelDetail></statemenModelDetail>
+        </el-tab-pane>
+      </el-tabs>
     </el-card>
-
-    <el-card class="el-card" style="margin-top: 10px">
-      <el-table v-loading="loading" :data="list" style="width: 100%" border>
-        <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="业务类型" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="模板名称" width="200">
-          <template slot-scope="scope">
-            <p v-if="scope.row.templateName === null">
-              <el-button
-                type="primary"
-                size="mini"
-                @click.native.stop="busSelectTemplate(scope.row)"
-              >选择模板
-              </el-button
-              >
-            </p>
-            <p v-if="scope.row.templateName !== null">
-              <el-button
-                type="primary"
-                size="mini"
-                @click.native.stop="busSelectTemplate(scope.row)"
-              >{{ scope.row.templateName }}
-              </el-button
-              >
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
-                      placeholder="请输入"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注字段2" prop="remark1" show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark2"
-                      placeholder="请输入"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
-                      placeholder="请输入"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.printType" placeholder="打印方式">
-              <el-option label="批次号" :value=0></el-option>
-              <el-option label="条码清单" :value=1></el-option>
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="150" prop="price">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="handleEdit(scope.$index, scope.row)"
-            >编辑
-            </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click="handleSave(scope.$index, scope.row)"
-            >保存
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <el-dialog
-        title="接口参数设置"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :visible.sync="modifyDetailDialogVisible"
-        width="70%"
-        v-if="modifyDetailDialogVisible"
-      >
-        <modifyDetailDialog :inputDetailQuery="inputDetailQuery"></modifyDetailDialog>
-        <div style="text-align: center">
-          <el-button type="primary" size="small" icon="search" @click="onDetailModifySubmit"
-          >提交
-          </el-button
-          >
-          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-          >取消
-          </el-button
-          >
-        </div>
-      </el-dialog>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="query.page"
-        :limit.sync="query.limit"
-        @pagination="getList"
-      />
-      <div style="margin-top: 18px ;  color: #F71616; font-size: 13px">
-        <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
-      </div>
-    </el-card>
-    <!--表单-->
-    <el-dialog
-      :title="formMap[formName]"
-      :visible.sync="formVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :before-close="hideForm"
-      width="85%"
-      top="5vh"
-    >
-      <el-form :model="formData" :rules="formRules" ref="dataForm">
-        <el-form-item label="模板名称" prop="name">
-          <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
-        </el-form-item>
-
-        <el-row :gutter="20">
-          <el-col :span="4">
-            <div class="ao-text">
-              <span>选择jasper模板：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-upload
-                class="upload-demo"
-                ref="upload"
-                :action="this.uploadUrl"
-                :on-preview="uploadHandlePreview"
-                :on-remove="uploadHandleRemove"
-                :limit="1"
-                :headers="headers"
-                :on-exceed="uploadHandleExceed"
-                accept=".jasper"
-                :on-change="uploadOnchange"
-                :on-success="uploadHandleSuccess"
-                :on-error="uploadHandleError"
-                :file-list="fileList"
-                :auto-upload="false">
-                <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
-                </el-button>
-                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
-                <div slot="tip" class="el-upload__tip">只能上传 jasper 文件，且不超过 2 MB</div>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <div class="ao-text">
-              <span>所属模块：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="module">
-              <el-select v-model="formData.module" placeholder="所属模块">
-                <el-option
-                  v-for="item in moduleNameList"
-                  :key="item.idStr"
-                  :label="item.name"
-                  :value="item.idStr"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="hideForm">取消</el-button>
-        <el-button
-          type="primary"
-          @click.native="submitUpload()"
-          :loading="formLoading"
-        >提交
-        </el-button
-        >
-      </div>
-    </el-dialog>
-    <!--    模块选择模板    -->
-    <el-dialog
-      title="选择模板"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :visible.sync="moduleFormVisible"
-      :before-close="moduleHideForm"
-      width="70%"
-      top="5vh"
-    >
-      <el-form ref="singleTable">
-        <el-table v-loading="selectTemplateLoading" :data="selectTemplateList" style="width: 100%"
-                  highlight-current-row
-                  @current-change="moduleSelectHandleCurrentChange">
-          <el-table-column type="index" label="序号" width="50"></el-table-column>
-          <el-table-column label="模板名称" prop="name" width="200"></el-table-column>
-          <el-table-column label="备注" prop="remark"></el-table-column>
-        </el-table>
-
-        <el-pagination
-          :page-size="selectTemplateQuery.limit"
-          @current-change="selectTemplateGetList"
-          layout="prev, pager, next"
-          :total="selectTemplateTotal"
-          :current-page="selectTemplateQuery.page"
-        >
-        </el-pagination>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="moduleHideForm">取消</el-button>
-        <el-button
-          type="primary"
-          @click.native="moduleSubmitSelectTemplate()"
-          :loading="moduleFormLoading"
-        >确定
-        </el-button
-        >
-      </div>
-    </el-dialog>
-    <el-dialog
-      title="字段说明"
-      :visible.sync="centerDialogVisible"
-      width="40%"
-      center>
-      <span style="white-space: pre-wrap;">{{ currentRow }}</span>
-      <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
-            </span>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  systemPDFTemplateList,
-  systemPDFTemplateSave,
-  systemPDFTemplateDeleteById,
-  systemPDFModuleList,
-  systemPDFModuleSave, updateDetailRel,
-  getSystemPDFModules, moduleDetail, updatePdfRelData
-} from "@/api/system/systemPDFTemplate";
-import {saveAs} from 'file-saver';
+import codeModelDetail from  "@/views/system/print/pdfCodePrintSet"
+import bizModelDetail from  "@/views/system/print/pdfBizPrintSet"
+import labelModelDetail from  "@/views/system/print/pdfLabelPrintSet"
+import statemenModelDetail from  "@/views/system/print/pdfStatementPrintSet"
 
-const formJson = {
-  id: "",
-  name: "",
-  type: "2",
-  module: "1",
-  param: "",
-  path: "",
-  rowCount: 10,
-  qrcodeCount: 1,
-  remark: "",
-};
-const moduleFormJson = {
-  id: "",
-  templateId: 0,
-};
 export default {
   data() {
     return {
       BASE_URL: process.env.VUE_APP_BASE_API,
-      query: {
-        templateType: null,
-        moduleId: null,
-        name: "",
-        page: 1,
-        limit: 20
-      },
-      headers: {},
-      list: [],
-      total: 0,
-      moduleQuery: {
-        name: "",
-        page: 1,
-        limit: 20
-      },
-      currentRow: null,
-      moduleList: [],
-      moduleNameList: [],
-      moduleTotal: 0,
-      selectTemplateQuery: {
-        busRlId: null,
-        name: "",
-        module: null,
-        page: 1,
-        limit: 10
-      },
-      centerDialogVisible: false,
-      selectTemplateList: [],
-      selectTemplateTotal: 0,
-      selectTemplateLoading: false,
-      moduleSelectQuery: {
-        name: "",
-        page: 1,
-        limit: 10
-      },
-      moduleSelectList: [],
-      moduleSelectTotal: 0,
-      loading: false,
-      index: null,
-      formName: null,
-      moduleFormName: null,
-      formMap: {
-        add: "新增",
-        update: "设置"
-      },
-      formLoading: false,
-      formVisible: false,
-      moduleFormLoading: false,
-      moduleFormVisible: false,
-      formData: formJson,
-      moduleFormData: moduleFormJson,
-      formRules: {
-        name: [
-          {required: true, message: "请输入模板名称", trigger: "blur"}
-        ],
-        module: [
-          {required: true, message: "请选择所属模块", trigger: "blur"}
-        ]
-      },
-      currentCheckIndex: -1,
-      deleteLoading: false,
-      uploadUrl: "",
-      fileList: [],
-      uploadDisabled: false,
-      moduleLoading: false,
-      moduleTypeMap: {0: "标签", 1: "报表", 2: "单据"},
-    };
+    }
   },
   methods: {
     onReset() {
@@ -428,418 +49,15 @@ export default {
       };
       this.getModuleList();
     },
-    onSubmit() {
-      this.getModuleList();
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getList();
-    },
-    moduleHandleCurrentChange(val) {
-      this.selectTemplateQuery.page = val;
-      this.selectTemplateGetList();
-    },
-    getList() {
-      // this.loading = true;
-      moduleDetail(this.query)
-        .then(response => {
-          this.loading = false;
-          this.list = response.data.list || [];
-          this.total = response.data.total;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.list = [];
-        });
-    },
-
-
-    handleSubCurrentChange(val) {
-      this.query.page = val;
-      this.getList();
-    },
-
-    moduleClick(row) {
-      this.query = {
-        templateType: row.templateType,
-        moduleId: row.id,
-        page: 1,
-        limit: 20
-      };
-      this.getList();
-    },
-
-    handleDownload(url, name) {
-      this.getBlob(url).then(blob => {
-        saveAs(blob, name);
-      })
-      return false;
-    },
-    getBlob(url) {
-      return new Promise(resolve => {
-        const xhr = new XMLHttpRequest();
-        xhr.open('GET', url, true);
-        xhr.responseType = 'blob';
-        xhr.onload = () => {
-          if (xhr.status === 200) {
-            resolve(xhr.response);
-          }
-        };
-        xhr.send();
-      })
-    },
-
-    jumpDl(row) {
-      this.handleDownload(BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml");
-    },
-    getModuleList() {
-      this.moduleLoading = true;
-      systemPDFModuleList(this.moduleQuery)
-        .then(response => {
-          this.moduleLoading = false;
-          this.moduleList = response.data.list || [];
-          this.moduleTotal = response.data.total || 0;
-        })
-        .catch(() => {
-          this.moduleLoading = false;
-          this.moduleList = [];
-          this.moduleTotal = 0;
-        });
-    },
-    // 刷新表单
-    resetForm() {
-      if (this.$refs["dataForm"]) {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
-        this.$refs["dataForm"].resetFields();
-        this.getList();
-      }
-    },
-    // 隐藏表单
-    hideForm() {
-      // 更改值
-      this.formVisible = !this.formVisible;
-      return true;
-    },
-    moduleHideForm() {
-      this.moduleFormVisible = !this.moduleFormVisible;
-      this.selectTemplateQuery.module = null;
-      return true;
-    },
-    moduleSelectTemplate(row) {
-      this.moduleFormData = {
-        id: row.id,
-        templateId: row.templateId,
-      };
-      this.moduleFormVisible = true;
-      this.selectTemplateQuery = {
-        module: row.templateType,
-        name: "",
-        page: 1,
-        limit: 20
-      };
-      this.selectTemplateGetList();
-    },
-
-    busSelectTemplate(row) {
-      this.moduleFormData = {
-        id: row.id,
-        templateId: row.templateId,
-      };
-      this.moduleFormVisible = true;
-      this.selectTemplateQuery = {
-        module: row.templateType,
-        busRlId: row.id,
-        type: 1,
-        name: "",
-        page: 1,
-        limit: 10
-      };
-
-      this.selectTemplateGetList();
-    },
-
-
-    selectTemplateGetList(val) {
-      this.selectTemplateLoading = true;
-      if (val != null) {
-        this.selectTemplateQuery.page = val;
-      }
-      systemPDFTemplateList(this.selectTemplateQuery)
-        .then(response => {
-          this.selectTemplateLoading = false;
-          this.selectTemplateList = response.data.list || [];
-          this.selectTemplateTotal = response.data.total || 0;
-        })
-        .catch(() => {
-          this.selectTemplateLoading = false;
-          this.selectTemplateList = [];
-          this.selectTemplateTotal = 0;
-        });
-    },
-    showFieldExpain(row) {
-
-      this.currentRow = row.fieldExplain.replace('\\\n', '<br>');
-      this.centerDialogVisible = true;
-      // const {href} = this.$router.resolve({//打开新窗口页面
-      //     path: '/showText',
-      //     query: {
-      //         content: row.fieldExplain
-      //     }
-      // })
-      // window.open(href, '_blank')
-    },
-    // 显示表单
-    handleForm(index, row) {
-      this.formVisible = true;
-      this.formData = JSON.parse(JSON.stringify(formJson));
-      this.fileList = [];
-      if (row !== null) {
-        this.formData = Object.assign({}, row);
-        this.formData.module = row.module + "";
-      }
-      this.index = index;
-      this.formName = "update";
-      this.uploadDisabled = true;
-    },
-
-
-    handleAddForm(row) {
-      this.formVisible = true;
-      this.formData = {module: row.id + ""};
-      this.fileList = [];
-      this.formName = "add";
-      this.uploadDisabled = false;
-    },
-    templateConfig(row) {
-
-    },
-    submitUpload() {
-      if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) {
-        this.$message.warning(`请选择jasper文件`);
-      }
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          if (!this.uploadDisabled) {
-            this.$refs.upload.submit();
-          } else {
-            this.submitTemplate();
-          }
-        }
-      });
-    },
-    uploadHandleRemove(file, fileList) {
-    },
-    uploadHandlePreview(file) {
-    },
-    uploadHandleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-    },
-    uploadOnchange(file, fileList) {
-      let fileName = file.name;
-      let uid = file.uid
-      let pos = fileName.lastIndexOf(".");
-      let lastName = fileName.substring(pos, fileName.length);
-      if (lastName.toLowerCase() !== ".jasper") {
-        this.$message.error("上传文件只能是 jasper 格式");
-        for (let i = 0; i < fileList.length; i++) {//从list删除
-          if (fileList[i].uid === uid) {
-            fileList.splice(i, 1)
-          }
-        }
-        return;
-      }
-      // 限制上传文件的大小
-      const isLt = file.size / 1024 / 1024 / 2 <= 1;
-      if (!isLt) {
-        this.$message.error("上传文件大小不能超过 2MB");
-        for (let i = 0; i < fileList.length; i++) {
-          if (fileList[i].uid === uid) {
-            fileList.splice(i, 1)
-          }
-        }
-      }
-      return isLt;
-    },
-    uploadHandleSuccess(response, file, fileList) {
-      if (response.code === 20000) {
-        this.formData.path = response.data.path;
-        this.submitTemplate();
-      } else {
-        this.$message.error("上传失败：" + response.message);
-      }
-    },
-    uploadHandleError() {
-
-    },
-    submitTemplate() {
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          this.formLoading = true;
-          let data = Object.assign({}, this.formData);
-          data.name = data.name.trim();
-          systemPDFTemplateSave(data, this.formName)
-            .then(response => {
-              this.formLoading = false;
-              if (response.code !== 20000) {
-                this.$message.error(response.message);
-                return false;
-              }
-              this.$message.success("操作成功");
-              this.formVisible = false;
-              if (this.formName === "add") {
-                // 向头部添加数据
-                if (response.data && response.data.id) {
-                  data.id = response.data.id;
-                  this.list.unshift(data);
-                }
-              } else {
-                this.list.splice(this.index, 1, data);
-              }
-              // 刷新表单
-              this.resetForm();
-              this.getList();
-              this.getModuleList();
-            })
-            .catch(() => {
-              this.formLoading = false;
-            });
-        }
-      });
-    },
-    deleteTemplate(row) {
-      this.$confirm("此操作将永久删除该模板, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        systemPDFTemplateDeleteById({id: row.id, path: row.path})
-          .then(response => {
-            if (response.code === 20000) {
-              this.$message.success(response.data);
-              // 刷新表单
-              this.resetForm();
-              this.getList();
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-
-          })
-      }).catch(() => {
-
-      });
-    },
-    moduleSelectSetCurrent(row) {
-      this.$refs.singleTable.setCurrentRow(row);
-    },
-    moduleSelectHandleCurrentChange(val) {
-      this.moduleFormData.templateId = val.id;
-    },
-    moduleSubmitSelectTemplate() {
-
-      this.moduleFormLoading = true;
-      let data = Object.assign({}, this.moduleFormData);
-      this.moduleFormName = 'update';
-      if (this.selectTemplateQuery.type == 1) {
-
-
-        let query = {
-          id: this.selectTemplateQuery.busRlId,
-          templateId: data.templateId,
-        }
-        updateDetailRel(query)
-          .then(response => {
-            this.moduleFormVisible = false;
-            this.moduleFormLoading = false;
-            if (response.code !== 20000) {
-              this.$message.error(response.message);
-              return false;
-            }
-            this.getList();
-          }).catch(() => {
-          this.moduleFormLoading = false;
-        });
-      } else
-        systemPDFModuleSave(data, this.moduleFormName)
-          .then(response => {
-            this.moduleFormLoading = false;
-            if (response.code !== 20000) {
-              this.$message.error(response.message);
-              return false;
-            }
-            this.$message.success("操作成功");
-            this.moduleFormVisible = false;
-            if (this.moduleFormName === "add") {
-              // 向头部添加数据
-              if (response.data && response.data.id) {
-                data.id = response.data.id;
-                this.moduleList.unshift(data);
-              }
-            } else {
-              this.moduleList.splice(this.index, 1, data);
-            }
-            this.getModuleList();
-          })
-          .catch(() => {
-            this.moduleFormLoading = false;
-          });
-    },
-    getPDFModuleNameList() {
-      getSystemPDFModules()
-        .then((response) => {
-          this.moduleNameList = response.data.list;
-          this.moduleNameMap = {};
-          this.moduleNameList.forEach((obj, index) => {
-            this.moduleNameMap[obj.id] = obj.name;
-          });
-        })
-        .catch(() => {
-        });
-    },
-
-    handleEdit(index, row) {
-      this.currentCheckIndex = index;
-    },
-    handleSave(index, row) {
-      this.currentCheckIndex = -1;
-      updateDetailRel(row).then((res) => {
-        if (res.code == 20000) {
-          this.$message.success(res.data);
-        }
-      })
-    },
-
   },
   filters: {
-    paramStatusFilterType(paramStatus) {
-      const paramStatusTypeMap = {
-        0: "gray",
-        1: "success"
-      };
-      return paramStatusTypeMap[paramStatus];
-    },
-    paramStatusFilterName(paramStatus) {
-      const paramStatusNameMap = {
-        1: "订单详情",
-        2: "配货管理-打印订单"
-      };
-      return paramStatusNameMap[paramStatus];
-    }
   },
   mounted() {
   },
-  created() {
-    this.getPDFModuleNameList();
-    this.getModuleList();
-    this.uploadUrl = BASE_URL + "/udiwms/upload/pdf/template";
-    this.headers = {
-      ADMIN_ID: store.getters.adminId,
-      ADMIN_TOKEN: store.getters.token,
-    };
-  }
+  components: {
+    codeModelDetail,bizModelDetail,labelModelDetail,statemenModelDetail
+  },
+
 };
 </script>
 
diff --git a/src/views/system/print/pdfStatementPrintSet.vue b/src/views/system/print/pdfStatementPrintSet.vue
new file mode 100644
index 00000000..6affff19
--- /dev/null
+++ b/src/views/system/print/pdfStatementPrintSet.vue
@@ -0,0 +1,758 @@
+<template>
+  <div>
+
+    <el-form
+      :inline="true"
+      :model="moduleQuery"
+      class="query-form"
+      size="mini"
+    >
+      <el-row>
+        <el-form-item class="query-form-item" label="功能名称:">
+          <el-input v-model="moduleQuery.name" placeholder="功能名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          </el-button-group>
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <el-table v-loading="moduleLoading" :data="moduleList" style="width: 100%" border @row-click="moduleClick" highlight-current-row>
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column label="功能名称" prop="name"></el-table-column>
+      <el-table-column label="备注" prop="remark"></el-table-column>
+      <el-table-column label="操作" width="250">
+        <template slot-scope="scope">
+          <el-button type="text" @click.native="showFieldExpain(scope.row)">字段说明</el-button>
+          <el-button type="text" @click="jumpDl(scope.row)">初始模板下载</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="moduleTotal>0"
+      :total="moduleTotal"
+      :page.sync="moduleQuery.page"
+      :limit.sync="moduleQuery.limit"
+      @pagination="getList"
+    />
+
+
+    <el-table v-loading="loading" :data="list" style="width: 100%;margin-top: 50px" border>
+      <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="功能名称" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="模板名称" width="200">
+        <template slot-scope="scope">
+          <p v-if="scope.row.templateName === null">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="busSelectTemplate(scope.row)"
+            >选择模板
+            </el-button
+            >
+          </p>
+          <p v-if="scope.row.templateName !== null">
+            <el-button
+              type="primary"
+              size="mini"
+              @click.native.stop="busSelectTemplate(scope.row)"
+            >{{ scope.row.templateName }}
+            </el-button
+            >
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段2" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark2"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
+                    placeholder="请输入"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="150" prop="price">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="small"
+            @click="handleEdit(scope.$index, scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            type="text"
+            size="small"
+            @click="handleSave(scope.$index, scope.row)"
+          >保存
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="query.page"
+      :limit.sync="query.limit"
+      @pagination="getList"
+    />
+    <div style="margin-top: 18px ;  color: #F71616; font-size: 13px">
+      <span>重要提示：本页功能仅供技术提供方修改&nbsp;</span>
+    </div>
+    <!--表单-->
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="formVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="hideForm"
+      width="85%"
+      top="5vh"
+    >
+      <el-form :model="formData" :rules="formRules" ref="dataForm">
+        <el-form-item label="模板名称" prop="name">
+          <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="textarea" v-model="formData.remark" rows=6></el-input>
+        </el-form-item>
+
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <div class="ao-text">
+              <span>选择jasper模板：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="">
+              <el-upload
+                class="upload-demo"
+                ref="upload"
+                :action="this.uploadUrl"
+                :on-preview="uploadHandlePreview"
+                :on-remove="uploadHandleRemove"
+                :limit="1"
+                :headers="headers"
+                :on-exceed="uploadHandleExceed"
+                accept=".jasper"
+                :on-change="uploadOnchange"
+                :on-success="uploadHandleSuccess"
+                :on-error="uploadHandleError"
+                :file-list="fileList"
+                :auto-upload="false">
+                <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
+                </el-button>
+                <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
+                <div slot="tip" class="el-upload__tip">只能上传 jasper 文件，且不超过 10 MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <div class="ao-text">
+              <span>所属模块：</span>
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="module">
+              <el-select v-model="formData.module" placeholder="所属模块">
+                <el-option
+                  v-for="item in moduleNameList"
+                  :key="item.idStr"
+                  :label="item.name"
+                  :value="item.idStr"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="hideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="submitUpload()"
+          :loading="formLoading"
+        >提交
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <!--    模块选择模板    -->
+    <el-dialog
+      title="选择模板"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="moduleFormVisible"
+      :before-close="moduleHideForm"
+      width="70%"
+      top="5vh"
+    >
+      <el-form ref="singleTable">
+        <el-table v-loading="selectTemplateLoading" :data="selectTemplateList" style="width: 100%"
+                  highlight-current-row border
+                  @current-change="moduleSelectHandleCurrentChange">
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column label="模板名称" prop="name" width="200"></el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
+        </el-table>
+
+        <el-pagination
+          :page-size="selectTemplateQuery.limit"
+          @current-change="selectTemplateGetList"
+          layout="prev, pager, next"
+          :total="selectTemplateTotal"
+          :current-page="selectTemplateQuery.page"
+        >
+        </el-pagination>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="moduleHideForm">取消</el-button>
+        <el-button
+          type="primary"
+          @click.native="moduleSubmitSelectTemplate()"
+          :loading="moduleFormLoading"
+        >确定
+        </el-button
+        >
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="字段说明"
+      :visible.sync="centerDialogVisible"
+      width="40%"
+      center>
+      <span style="white-space: pre-wrap;">{{ currentRow }}</span>
+      <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+            </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  systemPDFTemplateList,
+  systemPDFTemplateSave,
+  systemPDFTemplateDeleteById,
+  systemPDFModuleList,
+  systemPDFModuleSave, updateDetailRel,
+  getSystemPDFModules, moduleDetail, updatePdfRelData, moduleBizDetail, moduleStatementDetail, updateStatementDetailRel
+} from '@/api/system/systemPDFTemplate'
+import {saveAs} from 'file-saver';
+
+const formJson = {
+  id: "",
+  name: "",
+  type: "2",
+  module: "1",
+  param: "",
+  path: "",
+  rowCount: 10,
+  qrcodeCount: 1,
+  remark: "",
+};
+const moduleFormJson = {
+  id: "",
+  templateId: 0,
+};
+export default {
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      query: {
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      headers: {},
+      list: [],
+      total: 0,
+      moduleQuery: {
+        name: "",
+        page: 1,
+        limit: 20
+      },
+      currentRow: null,
+      moduleList: [],
+      moduleNameList: [],
+      moduleTotal: 0,
+      selectTemplateQuery: {
+        busRlId: null,
+        name: "",
+        module: null,
+        page: 1,
+        limit: 10
+      },
+      centerDialogVisible: false,
+      selectTemplateList: [],
+      selectTemplateTotal: 0,
+      selectTemplateLoading: false,
+      moduleSelectQuery: {
+        name: "",
+        page: 1,
+        limit: 10
+      },
+      moduleSelectList: [],
+      moduleSelectTotal: 0,
+      loading: false,
+      index: null,
+      formName: null,
+      moduleFormName: null,
+      formMap: {
+        add: "新增",
+        update: "设置"
+      },
+      formLoading: false,
+      formVisible: false,
+      moduleFormLoading: false,
+      moduleFormVisible: false,
+      formData: formJson,
+      moduleFormData: moduleFormJson,
+      formRules: {
+        name: [
+          {required: true, message: "请输入模板名称", trigger: "blur"}
+        ],
+        module: [
+          {required: true, message: "请选择所属模块", trigger: "blur"}
+        ]
+      },
+      currentCheckIndex: -1,
+      deleteLoading: false,
+      uploadUrl: "",
+      fileList: [],
+      uploadDisabled: false,
+      moduleLoading: false,
+      moduleTypeMap: {0: "标签", 1: "报表", 2: "单据"},
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: ""
+      });
+      this.moduleQuery = {
+        templateType: null,
+        moduleId: null,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.getModuleList();
+    },
+    onSubmit() {
+      this.getModuleList();
+    },
+    handleCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+    moduleHandleCurrentChange(val) {
+      this.selectTemplateQuery.page = val;
+      this.selectTemplateGetList();
+    },
+    getList() {
+      // this.loading = true;
+      moduleStatementDetail(this.query)
+        .then(response => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
+    handleSubCurrentChange(val) {
+      this.query.page = val;
+      this.getList();
+    },
+
+    moduleClick(row) {
+      this.query = {
+        modelKey: row.modelKey,
+        page: 1,
+        limit: 20
+      };
+      this.getList();
+    },
+
+    handleDownload(url, name) {
+      this.getBlob(url).then(blob => {
+        saveAs(blob, name);
+      })
+      return false;
+    },
+    getBlob(url) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url, true);
+        xhr.responseType = 'blob';
+        xhr.onload = () => {
+          if (xhr.status === 200) {
+            resolve(xhr.response);
+          }
+        };
+        xhr.send();
+      })
+    },
+
+    jumpDl(row) {
+      this.handleDownload(this.BASE_URL + "/udiwms/donwload/printFile?fileName=" + row.templateDlUrl, row.name + ".jrxml");
+    },
+    getModuleList() {
+      this.moduleLoading = true;
+      this.moduleQuery.templateType=1
+      systemPDFModuleList(this.moduleQuery)
+        .then(response => {
+          this.moduleLoading = false;
+          this.moduleList = response.data.list || [];
+          this.moduleTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.moduleLoading = false;
+          this.moduleList = [];
+          this.moduleTotal = 0;
+        });
+    },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    // 隐藏表单
+    hideForm() {
+      // 更改值
+      this.formVisible = !this.formVisible;
+      return true;
+    },
+    moduleHideForm() {
+      this.moduleFormVisible = !this.moduleFormVisible;
+      this.selectTemplateQuery.module = null;
+      return true;
+    },
+    moduleSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        name: "",
+        page: 1,
+        limit: 20
+      };
+      this.selectTemplateGetList();
+    },
+
+    busSelectTemplate(row) {
+      this.moduleFormData = {
+        id: row.id,
+        templateId: row.templateId,
+      };
+      this.moduleFormVisible = true;
+      this.selectTemplateQuery = {
+        module: row.templateType,
+        busRlId: row.id,
+        type: 1,
+        name: "",
+        page: 1,
+        limit: 10
+      };
+
+      this.selectTemplateGetList();
+    },
+
+
+    selectTemplateGetList(val) {
+      this.selectTemplateLoading = true;
+      if (val != null) {
+        this.selectTemplateQuery.page = val;
+      }
+      systemPDFTemplateList(this.selectTemplateQuery)
+        .then(response => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = response.data.list || [];
+          this.selectTemplateTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.selectTemplateLoading = false;
+          this.selectTemplateList = [];
+          this.selectTemplateTotal = 0;
+        });
+    },
+    showFieldExpain(row) {
+
+      this.currentRow = row.fieldExplain.replace('\\\n', '<br>');
+      this.centerDialogVisible = true;
+      // const {href} = this.$router.resolve({//打开新窗口页面
+      //     path: '/showText',
+      //     query: {
+      //         content: row.fieldExplain
+      //     }
+      // })
+      // window.open(href, '_blank')
+    },
+    // 显示表单
+    handleForm(index, row) {
+      this.formVisible = true;
+      this.formData = JSON.parse(JSON.stringify(formJson));
+      this.fileList = [];
+      if (row !== null) {
+        this.formData = Object.assign({}, row);
+        this.formData.module = row.module + "";
+      }
+      this.index = index;
+      this.formName = "update";
+      this.uploadDisabled = true;
+    },
+
+
+    handleAddForm(row) {
+      this.formVisible = true;
+      this.formData = {module: row.id + ""};
+      this.fileList = [];
+      this.formName = "add";
+      this.uploadDisabled = false;
+    },
+    templateConfig(row) {
+
+    },
+    submitUpload() {
+      if (this.$refs.upload.uploadFiles.length < 1 && !this.uploadDisabled) {
+        this.$message.warning(`请选择jasper文件`);
+      }
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          if (!this.uploadDisabled) {
+            this.$refs.upload.submit();
+          } else {
+            this.submitTemplate();
+          }
+        }
+      });
+    },
+    uploadHandleRemove(file, fileList) {
+    },
+    uploadHandlePreview(file) {
+    },
+    uploadHandleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    uploadOnchange(file, fileList) {
+      let fileName = file.name;
+      let uid = file.uid
+      let pos = fileName.lastIndexOf(".");
+      let lastName = fileName.substring(pos, fileName.length);
+      if (lastName.toLowerCase() !== ".jasper") {
+        this.$message.error("上传文件只能是 jasper 格式");
+        for (let i = 0; i < fileList.length; i++) {//从list删除
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+        return;
+      }
+      // 限制上传文件的大小
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
+      if (!isLt) {
+        this.$message.error("上传文件大小不能超过 30MB");
+        for (let i = 0; i < fileList.length; i++) {
+          if (fileList[i].uid === uid) {
+            fileList.splice(i, 1)
+          }
+        }
+      }
+      return isLt;
+    },
+    uploadHandleSuccess(response, file, fileList) {
+      if (response.code === 20000) {
+        this.formData.path = response.data.path;
+        this.submitTemplate();
+      } else {
+        this.$message.error("上传失败：" + response.message);
+      }
+    },
+    uploadHandleError() {
+
+    },
+    submitTemplate() {
+      this.$refs["dataForm"].validate(valid => {
+        if (valid) {
+          this.formLoading = true;
+          let data = Object.assign({}, this.formData);
+          data.name = data.name.trim();
+          systemPDFTemplateSave(data, this.formName)
+            .then(response => {
+              this.formLoading = false;
+              if (response.code !== 20000) {
+                this.$message.error(response.message);
+                return false;
+              }
+              this.$message.success("操作成功");
+              this.formVisible = false;
+              if (this.formName === "add") {
+                // 向头部添加数据
+                if (response.data && response.data.id) {
+                  data.id = response.data.id;
+                  this.list.unshift(data);
+                }
+              } else {
+                this.list.splice(this.index, 1, data);
+              }
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+              this.getModuleList();
+            })
+            .catch(() => {
+              this.formLoading = false;
+            });
+        }
+      });
+    },
+    deleteTemplate(row) {
+      this.$confirm("此操作将永久删除该模板, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        systemPDFTemplateDeleteById({id: row.id, path: row.path})
+          .then(response => {
+            if (response.code === 20000) {
+              this.$message.success(response.data);
+              // 刷新表单
+              this.resetForm();
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+
+          })
+      }).catch(() => {
+
+      });
+    },
+    moduleSelectSetCurrent(row) {
+      this.$refs.singleTable.setCurrentRow(row);
+    },
+    moduleSelectHandleCurrentChange(val) {
+      this.moduleFormData.templateId = val.id;
+    },
+    moduleSubmitSelectTemplate() {
+
+      this.moduleFormLoading = true;
+      let data = Object.assign({}, this.moduleFormData);
+      this.moduleFormName = 'update';
+      if (this.selectTemplateQuery.type == 1) {
+
+
+        let query = {
+          id: this.selectTemplateQuery.busRlId,
+          templateId: data.templateId,
+        }
+        updateStatementDetailRel(query)
+          .then(response => {
+            this.moduleFormVisible = false;
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.getList();
+          }).catch(() => {
+          this.moduleFormLoading = false;
+        });
+      } else
+        systemPDFModuleSave(data, this.moduleFormName)
+          .then(response => {
+            this.moduleFormLoading = false;
+            if (response.code !== 20000) {
+              this.$message.error(response.message);
+              return false;
+            }
+            this.$message.success("操作成功");
+            this.moduleFormVisible = false;
+            if (this.moduleFormName === "add") {
+              // 向头部添加数据
+              if (response.data && response.data.id) {
+                data.id = response.data.id;
+                this.moduleList.unshift(data);
+              }
+            } else {
+              this.moduleList.splice(this.index, 1, data);
+            }
+            this.getModuleList();
+          })
+          .catch(() => {
+            this.moduleFormLoading = false;
+          });
+    },
+
+    handleEdit(index, row) {
+      this.currentCheckIndex = index;
+    },
+    handleSave(index, row) {
+      this.currentCheckIndex = -1;
+      updateDetailRel(row).then((res) => {
+        if (res.code == 20000) {
+          this.$message.success(res.data);
+        }
+      })
+    },
+
+  },
+  filters: {
+    paramStatusFilterType(paramStatus) {
+      const paramStatusTypeMap = {
+        0: "gray",
+        1: "success"
+      };
+      return paramStatusTypeMap[paramStatus];
+    },
+    paramStatusFilterName(paramStatus) {
+      const paramStatusNameMap = {
+        1: "订单详情",
+        2: "配货管理-打印订单"
+      };
+      return paramStatusNameMap[paramStatus];
+    }
+  },
+  mounted() {
+  },
+  created() {
+    this.getModuleList();
+    this.uploadUrl = this.BASE_URL + "/udiwms/upload/pdf/template";
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+  }
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/system/print/pdfTmpleateManage.vue b/src/views/system/print/pdfTmpleateManage.vue
index d48264e8..9c77d51a 100644
--- a/src/views/system/print/pdfTmpleateManage.vue
+++ b/src/views/system/print/pdfTmpleateManage.vue
@@ -9,7 +9,7 @@
       >
         <el-row>
           <el-form-item class="query-form-item" label="模板名称:">
-            <el-input v-model="query.name" placeholder="模板名称" style="width: 100%"></el-input>
+            <el-input v-model="query.name" placeholder="模板名称" style="width: 100%" clearable></el-input>
           </el-form-item>
           <el-form-item class="query-form-item" label="模板类型:">
             <el-select v-model="query.module" placeholder="模板类型">
@@ -36,7 +36,7 @@
             {{ moduleNameMap[scope.row.module] }}
           </template>
         </el-table-column>
-        <el-table-column label="更新时间" prop="update_time"></el-table-column>
+<!--        <el-table-column label="更新时间" prop="update_time"></el-table-column>-->
 
         <!--                <el-table-column label="表格行数" prop="rowCount" width="100"></el-table-column>-->
         <!--                <el-table-column label="二维码数量" prop="qrcodeCount" width="125"></el-table-column>-->
@@ -102,8 +102,8 @@
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="22" class="el-col" type="flex">
             <el-form-item prop="module" label="模板类型:" label-width="100px">
-              <el-select v-model="formData.module" placeholder="模板类型" style="width: 100%">
-                <el-option label="标签" value="0"></el-option>
+              <el-select v-model="formData.module" @change="isCleck"  placeholder="模板类型" style="width: 100%" >
+                <el-option label="标签" value="0" ></el-option>
                 <el-option label="报表" value="1"></el-option>
                 <el-option label="单据" value="2"></el-option>
               </el-select>
@@ -111,6 +111,30 @@
           </el-col>
         </el-row>
 
+<!--        <el-row :gutter="20" class="el-row" type="flex" v-show="formData.module==2">-->
+<!--          <el-col :span="22" class="el-col" type="flex">-->
+<!--            <el-form-item prop="bussinessType" label="单据类型:" label-width="100px">-->
+<!--              <el-radio-group v-model="formData.bussinessType">-->
+<!--                <el-radio :label=1>业务单</el-radio>-->
+<!--                <el-radio :label=2>出入库单</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        <el-row :gutter="20" class="el-row" type="flex" v-show="formData.module==2">-->
+<!--          <el-col :span="22" class="el-col" type="flex">-->
+<!--            <el-form-item prop="bussinessStatus" label="单据状态:" label-width="100px">-->
+<!--              <el-checkbox-group v-model="formData.bussinessStatusList">-->
+<!--                <el-checkbox label=3>待校验</el-checkbox>-->
+<!--                <el-checkbox label=5>待核对</el-checkbox>-->
+<!--                <el-checkbox label=10>待审核</el-checkbox>-->
+<!--                <el-checkbox label=7>已审核</el-checkbox>-->
+<!--              </el-checkbox-group>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
 
         <el-row :gutter="20">
           <el-col :span="22">
@@ -133,7 +157,7 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
                 </el-button>
                 <!--                               <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
-                <div slot="tip" class="el-upload__tip" v-if="formData.path==''">只能上传 jasper 文件，且不超过 2
+                <div slot="tip" class="el-upload__tip" v-if="formData.path==''">只能上传 jasper 文件，且不超过 10
                   MB
                 </div>
                 <div slot="tip" class="el-upload__tip">{{ formData.path }}</div>
@@ -160,7 +184,7 @@
                 <el-button slot="trigger" size="small" type="primary" :disabled="uploadDisabled">选取文件
                 </el-button>
                 <div slot="tip" class="el-upload__tip" v-if="formData.jrxmlPath==null">只能上传 jrxml
-                  文件，且不超过 2 MB
+                  文件，且不超过 10 MB
                 </div>
                 <div slot="tip" class="el-upload__tip">{{ formData.jrxmlPath }}</div>
               </el-upload>
@@ -268,6 +292,8 @@ const formJson = {
   rowCount: 10,
   qrcodeCount: 1,
   remark: "",
+  bussinessType:null,
+  bussinessStatusList:[],
 };
 const moduleFormJson = {
   id: "",
@@ -364,6 +390,12 @@ export default {
       };
       this.getList();
     },
+    isCleck(){
+      if(this.formData.module!="2"){
+        this.formData.bussinessStatusList=[];
+        this.formData.bussinessType=null;
+      }
+    },
     onSubmit() {
       this.query.page = 1;
       this.getList();
@@ -561,9 +593,11 @@ export default {
     submitUpload() {
       if (this.$refs.uploadJasper.uploadFiles.length < 1 && !this.uploadDisabled) {
         this.$message.warning(`请选择jasper文件`);
+        return
       }
       if (this.$refs.uploadJrxml.uploadFiles.length < 1 && !this.uploadDisabled) {
         this.$message.warning(`请选择jasper文件`);
+        return
       }
       console.log(this.formName)
       this.$refs["dataForm"].validate(valid => {
@@ -590,9 +624,9 @@ export default {
         return;
       }
       // 限制上传文件的大小
-      const isLt = file.size / 1024 / 1024 / 2 <= 1;
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
       if (!isLt) {
-        this.$message.error("上传文件大小不能超过 2MB");
+        this.$message.error("上传文件大小不能超过 30MB");
         for (let i = 0; i < fileList.length; i++) {
           if (fileList[i].uid === uid) {
             fileList.splice(i, 1)
@@ -629,9 +663,9 @@ export default {
         return;
       }
       // 限制上传文件的大小
-      const isLt = file.size / 1024 / 1024 / 2 <= 1;
+      const isLt = file.size / 1024 / 1024 / 30 <= 1;
       if (!isLt) {
-        this.$message.error("上传文件大小不能超过 2MB");
+        this.$message.error("上传文件大小不能超过 30MB");
         for (let i = 0; i < fileList.length; i++) {
           if (fileList[i].uid === uid) {
             fileList.splice(i, 1)
diff --git a/vue.config.js b/vue.config.js
index 2a85f322..0c3feeb1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,15 +1,15 @@
-'use strict'
-const path = require('path')
+"use strict";
+const path = require("path");
 
 function resolve(dir) {
-  return path.join(__dirname, dir)
+  return path.join(__dirname, dir);
 }
 
-const CompressionPlugin = require('compression-webpack-plugin')
+const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = process.env.VUE_APP_TITLE || 'UDI管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || "UDI管理系统"; // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -20,117 +20,116 @@ module.exports = {
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.VUE_APP_CONTEXT_PATH,
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'UDI_WMS_NEW',
+  outputDir: "UDI_WMS_NEW",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
+  assetsDir: "static",
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
-  lintOnSave: process.env.NODE_ENV === 'development',
+  lintOnSave: process.env.NODE_ENV === "development",
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
   // webpack-dev-server 相关配置
   devServer: {
-    host: '0.0.0.0',
+    host: "0.0.0.0",
     port: port,
     open: false,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+<<<<<<< HEAD
         target: `http://192.168.0.166:9991/`,
+=======
+        target: `http://192.168.0.66:9150/UDI_WMS_MC/`,
+>>>>>>> 9888474ccf2da85118a27d3e30da15957c8302ff
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
+          ["^" + process.env.VUE_APP_BASE_API]: "",
+        },
+      },
     },
-    disableHostCheck: true
+    disableHostCheck: true,
   },
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" }
-      }
-    }
+        sassOptions: { outputStyle: "expanded" },
+      },
+    },
   },
   configureWebpack: {
     name: name,
     resolve: {
       alias: {
-        '@': resolve('src')
-      }
+        "@": resolve("src"),
+      },
     },
     plugins: [
       // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
       new CompressionPlugin({
-        cache: false,                   // 不启用文件缓存
-        test: /\.(js|css|html)?$/i,     // 压缩文件格式
-        filename: '[path].gz[query]',   // 压缩后的文件名
-        algorithm: 'gzip',              // 使用gzip压缩
-        minRatio: 0.8                   // 压缩率小于1才会压缩
-      })
+        cache: false, // 不启用文件缓存
+        test: /\.(js|css|html)?$/i, // 压缩文件格式
+        filename: "[path].gz[query]", // 压缩后的文件名
+        algorithm: "gzip", // 使用gzip压缩
+        minRatio: 0.8, // 压缩率小于1才会压缩
+      }),
     ],
   },
   chainWebpack(config) {
-    config.plugins.delete('preload') // TODO: need test
-    config.plugins.delete('prefetch') // TODO: need test
+    config.plugins.delete("preload"); // TODO: need test
+    config.plugins.delete("prefetch"); // TODO: need test
 
     // set svg-sprite-loader
+    config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
     config.module
-      .rule('svg')
-      .exclude.add(resolve('src/assets/icons'))
-      .end()
-    config.module
-      .rule('icons')
+      .rule("icons")
       .test(/\.svg$/)
-      .include.add(resolve('src/assets/icons'))
+      .include.add(resolve("src/assets/icons"))
       .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
+      .use("svg-sprite-loader")
+      .loader("svg-sprite-loader")
       .options({
-        symbolId: 'icon-[name]'
+        symbolId: "icon-[name]",
       })
-      .end()
+      .end();
 
-    config
-      .when(process.env.NODE_ENV !== 'development',
-        config => {
-          config
-            .plugin('ScriptExtHtmlWebpackPlugin')
-            .after('html')
-            .use('script-ext-html-webpack-plugin', [{
-              // `runtime` must same as runtimeChunk name. default is `runtime`
-              inline: /runtime\..*\.js$/
-            }])
-            .end()
-          config
-            .optimization.splitChunks({
-            chunks: 'all',
-            cacheGroups: {
-              libs: {
-                name: 'chunk-libs',
-                test: /[\\/]node_modules[\\/]/,
-                priority: 10,
-                chunks: 'initial' // only package third parties that are initially dependent
-              },
-              elementUI: {
-                name: 'chunk-elementUI', // split elementUI into a single package
-                priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-              },
-              commons: {
-                name: 'chunk-commons',
-                test: resolve('src/components'), // can customize your rules
-                minChunks: 3, //  minimum common number
-                priority: 5,
-                reuseExistingChunk: true
-              }
-            }
-          })
-          config.optimization.runtimeChunk('single'),
-            {
-              from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-              to: './' //到根目录下
-            }
-        }
-      )
-  }
-}
+    config.when(process.env.NODE_ENV !== "development", (config) => {
+      config
+        .plugin("ScriptExtHtmlWebpackPlugin")
+        .after("html")
+        .use("script-ext-html-webpack-plugin", [
+          {
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+            inline: /runtime\..*\.js$/,
+          },
+        ])
+        .end();
+      config.optimization.splitChunks({
+        chunks: "all",
+        cacheGroups: {
+          libs: {
+            name: "chunk-libs",
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: "initial", // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: "chunk-elementUI", // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
+          },
+          commons: {
+            name: "chunk-commons",
+            test: resolve("src/components"), // can customize your rules
+            minChunks: 3, //  minimum common number
+            priority: 5,
+            reuseExistingChunk: true,
+          },
+        },
+      });
+      config.optimization.runtimeChunk("single"),
+        {
+          from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
+          to: "./", //到根目录下
+        };
+    });
+  },
+};

From 7d2731439bc01cfff22380cf1b58ba37c0c22023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Wed, 19 Apr 2023 11:01:56 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E9=80=89?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue       | 34 +++++++++----
 src/views/inout/DialogCreateOrderSelect.vue | 53 ++++++++++-----------
 vue.config.js                               |  6 +--
 3 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 59006fdf..67ccebb9 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -14,6 +14,7 @@
           <el-button
             size="mini"
             type="primary"
+            v-if="documentShow"
             @click.native="OptionalDocument()"
             >选入预验收库单
           </el-button>
@@ -184,10 +185,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="documentShow">
           <el-col :span="11">
             <el-form-item prop="" label="预验收单据:">
-              <el-input v-model="orderFormData.Acceptance"></el-input>
+              <el-input
+                :disabled="true"
+                v-model="orderFormData.checkPreInOrders"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -284,7 +288,10 @@
       append-to-body
       @close="closeDialogtwo"
     >
-      <dialog-create-order-select @giveselectbox="giveselectbox" :closeDialogtwo="closeDialogtwo">
+      <dialog-create-order-select
+        @giveselectbox="giveselectbox"
+        :closeDialogtwo="closeDialogtwo"
+      >
       </dialog-create-order-select>
     </el-dialog>
   </div>
@@ -346,7 +353,7 @@ export default {
         remark: null,
         fromType: 2,
         errMsg: null,
-        Acceptance: null,
+        checkPreInOrders: null,
       },
       errView: 0,
       //选入相关
@@ -419,6 +426,8 @@ export default {
       viewBizVisible: false,
       viewCodeVisible: false,
       viewCodeDetailVisible: false,
+     
+      documentShow:false,//控制预选单显示隐藏
     };
   },
   components: {
@@ -446,14 +455,18 @@ export default {
         })
         .catch(() => {});
     },
-     //接收预选单传值
-     giveselectbox(val){
-         this.orderFormData.Acceptance=val
+    //接收预选单传值
+    giveselectbox(val) {
+      this.orderFormData.checkPreInOrders = val;
     },
     //仓库改变
     changeInv() {
       this.orderFormData.action = null;
       this.getBusTypeByInv();
+
+      // if(scanPreIn = true  &&  backPreinType === 1){
+
+      // }
     },
 
     //根据仓库,用户获取单据类型
@@ -552,6 +565,11 @@ export default {
         this.orderFormData.fromInvCode = null;
         this.findFromInvList();
       }
+      if(this.curAction.scanPreIn = true  &&  this.curAction.backPreinType == 1){
+        this.documentShow=true
+      }
+
+
     },
 
     //获取往来仓库列表
@@ -914,7 +932,7 @@ export default {
   created() {
     //页面初始化
     this.codeFormData.code = "";
-    this.giveselectbox()
+    this.giveselectbox();
     //页面类型
     if (this.viewType == 2) {
       //2.新增扫码单据页面，1、新增业务单据页面，3、正常页面
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index ce28b099..74f699d3 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -125,7 +125,7 @@
         border
         @row-click="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55"></el-table-column>
+        <!-- <el-table-column type="selection" width="55"></el-table-column> -->
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
           label="扫码单据类型"
@@ -241,12 +241,11 @@ const formJson = {
 export default {
   name: "IoAuditedOrder",
   props: {
-        closeDialogtwo: {
-            type: Function,
-            required: true,
-        },
-
+    closeDialogtwo: {
+      type: Function,
+      required: true,
     },
+  },
   data() {
     return {
       showSearch: true,
@@ -362,8 +361,8 @@ export default {
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
-      selectboxs:[],
-      selectbox:"",
+      selectboxs: [],
+      selectbox: "",
     };
   },
   components: {},
@@ -401,26 +400,24 @@ export default {
       this.getList();
     },
     //选入
-     combine() {
-         this.closeDialogtwo()
-        this.$emit("giveselectbox", this.selectbox);
-      },
-      //选择
-      select(selection,row){
-          
-        //   console.log(row);
-        this.selectboxs.push(row)
-        let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
-         let qwe = nerArr.map(item=>{
-      // 每一项的单号
-      return item.billNo
-    })
-        this.selectbox=qwe
-      },
-    //关闭对话框
-    closeLocalDialog(){
-           
+    combine() {
+      this.closeDialogtwo();
+      this.$emit("giveselectbox", this.currentRow.billNo);
     },
+    //   //选择
+    //   select(selection,row){
+
+    //     //   console.log(row);
+    //     this.selectboxs.push(row)
+    //     let nerArr = JSON.parse(JSON.stringify(this.selectboxs))
+    //      let qwe = nerArr.map(item=>{
+    //   // 每一项的单号
+    //   return item.billNo
+    // })
+    //     this.selectbox=qwe
+    //   },
+    //关闭对话框
+    closeLocalDialog() {},
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
@@ -437,7 +434,7 @@ export default {
     },
     handleSelectionChange(val) {
       this.currentRow = val;
-      console.log(this.currentRow);
+      console.log(this.currentRow.billNo);
       this.getOrderDetails();
     },
     // 获取单据 业务详情、扫码详情、扫码明细
diff --git a/vue.config.js b/vue.config.js
index 0c3feeb1..bf23e227 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,11 +35,9 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-<<<<<<< HEAD
-        target: `http://192.168.0.166:9991/`,
-=======
+
+
         target: `http://192.168.0.66:9150/UDI_WMS_MC/`,
->>>>>>> 9888474ccf2da85118a27d3e30da15957c8302ff
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From 5b8631e39d7a646a4aff2b502435107bc930ea0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Wed, 19 Apr 2023 11:08:58 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E5=8D=95show=20bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 67ccebb9..403e8fc4 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -567,6 +567,8 @@ export default {
       }
       if(this.curAction.scanPreIn = true  &&  this.curAction.backPreinType == 1){
         this.documentShow=true
+      }else{
+        this.documentShow=false
       }
 
 

From cde95abe15bf9d724394841a4be798c1cd08f805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Wed, 19 Apr 2023 11:48:13 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=A8=A1=E5=9D=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 403e8fc4..6ce24f20 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -187,8 +187,9 @@
         </el-row>
         <el-row v-if="documentShow">
           <el-col :span="11">
-            <el-form-item prop="" label="预验收单据:">
+            <el-form-item prop="acceptance" label="预验收单据:">
               <el-input
+                style="width:90%"
                 :disabled="true"
                 v-model="orderFormData.checkPreInOrders"
               ></el-input>
@@ -398,6 +399,9 @@ export default {
         action: [
           { required: true, message: "请选择单据类型", trigger: "change" },
         ],
+        acceptance:[
+          {required: true, message: "请选入预验收单据", trigger: "blur"},
+        ]
       },
       isScan: true,
       scanText: "扫码录入：",
@@ -463,10 +467,6 @@ export default {
     changeInv() {
       this.orderFormData.action = null;
       this.getBusTypeByInv();
-
-      // if(scanPreIn = true  &&  backPreinType === 1){
-
-      // }
     },
 
     //根据仓库,用户获取单据类型
@@ -567,10 +567,13 @@ export default {
       }
       if(this.curAction.scanPreIn = true  &&  this.curAction.backPreinType == 1){
         this.documentShow=true
-      }else{
+      }else if(this.orderFormData.action===""){
         this.documentShow=false
       }
-
+      else{
+        this.documentShow=false
+      }
+     this.giveselectbox();
 
     },
 
@@ -934,7 +937,6 @@ export default {
   created() {
     //页面初始化
     this.codeFormData.code = "";
-    this.giveselectbox();
     //页面类型
     if (this.viewType == 2) {
       //2.新增扫码单据页面，1、新增业务单据页面，3、正常页面

From bfb6b7eb28e17bd568e6966a692bbc44ea8b4893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E6=99=A8=E6=99=A8?= <ccc2020712@163.com>
Date: Wed, 19 Apr 2023 11:59:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 6ce24f20..24ea270d 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -466,6 +466,9 @@ export default {
     //仓库改变
     changeInv() {
       this.orderFormData.action = null;
+      if(this.documentShow=true){
+        this.documentShow=false
+      }
       this.getBusTypeByInv();
     },
 
@@ -567,8 +570,6 @@ export default {
       }
       if(this.curAction.scanPreIn = true  &&  this.curAction.backPreinType == 1){
         this.documentShow=true
-      }else if(this.orderFormData.action===""){
-        this.documentShow=false
       }
       else{
         this.documentShow=false