1.运行参数添加删除功能

2.提交单据到自助平台增加提示弹框
3.调整菜单
4.调整打印设置页面，增加预览功能

src/api/param/systemParamConfig.js

@@ -57,3 +57,12 @@ export function addCustomizeParam(data) {
         data: data
     });
 }
+
+//删除参数
+export function deleteParam(query) {
+    return axios({
+        url: "/udiwms/sys/config/deleteParam",
+        method: "get",
+        params: query
+    });
+}

src/router/index.js

@@ -235,15 +235,14 @@ export const asyncRouterMap = [
                 }
             },
             {
-                path: "/systemPDFTemplate",
+                path: "systemPDFTemplate/template",
-                component: Empty,
+                component: systemPDFTemplate,
                 name: "打印模板",
-                redirect: "/systemPDFTemplate/template",
                 icon: "",
                 meta: {
                     authRule: ["systemParam/systemPDFTemplate"]
                 },
-                children: [
+                /*children: [
                     {
                         path: "template",
                         component: systemPDFTemplate,
@@ -253,7 +252,7 @@ export const asyncRouterMap = [
                             authRule: ["pdf/template"]
                         }
                     }
-                ]
+                ]*/
             },
             {
                 path: "/enterpriseManage",

src/views/product/UnitManage.vue

@@ -92,6 +92,51 @@
             :close-on-press-escape="false"
         >
             <el-form :model="editQuery" ref="editQuery" :rules="rules">
+                <!--<el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="10" class="el-col">
+                        <div class="text item">
+                            <div class="text item">
+                                <el-form-item label="往来单位名称" prop="name">
+                                    <el-input v-model="editQuery.name" auto-complete="off"></el-input>
+                                </el-form-item>
+                                <el-form-item label="拼音码" prop="pinyinCode">
+                                    <el-input v-model="editQuery.pinyinCode" auto-complete="off" ></el-input>
+                                </el-form-item>
+                                <el-form-item label="企业自定义ID" prop="thirdId">
+                                    <el-input v-model="editQuery.thirdId"" auto-complete="off" ></el-input>
+                                </el-form-item>
+                                <el-form-item label="社会信用号" prop="creditNo">
+                                    <el-input type="" v-model="editQuery.creditNo" auto-complete="off" :disabled="true"></el-input>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </el-col>
+                    <el-col :span="10" class="el-col" type="flex">
+                        <div class="text item">
+                            <el-form-item label="往来单位编码" prop="contact">
+                                <el-input v-model="editQuery.contact" auto-complete="off" :disabled="true"></el-input>
+                            </el-form-item>
+                            <el-form-item label="第三方往来单位ID" prop="thirdId">
+                                <el-input v-model="editQuery.mobile" auto-complete="off" :disabled="true"></el-input>
+                            </el-form-item>
+                            <el-form-item label="地址" prop="addr">
+                                <el-input v-model="editQuery.addr" auto-complete="off" :disabled="true"></el-input>
+                            </el-form-item>
+                            <el-form-item v-if="spellUpdate" label="往来单位类型" prop="corpType">
+                                <el-select v-model="editQuery.corpType" placeholder="往来单位类型">
+                                    <el-option
+                                        v-for="item in corpTypeList"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </div>
+                    </el-col>
+                </el-row>-->
+
+
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="10" class="el-col" type="flex">
                         <div class="text item">
@@ -105,18 +150,16 @@
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="10" class="el-col">
+                    <el-col :span="10" class="el-col" type="flex">
-                        <div class="text item">
                         <div class="text item">
-                                <el-form-item label="往来单位简写" prop="spell">
+                            <el-form-item label="拼音码" prop="pinyinCode">
                                 <el-input
-                                        v-model="editQuery.spell"
+                                    v-model="editQuery.pinyinCode"
-                                        size="small"
                                     style="width: 60%"
+                                    size="small"
                                 ></el-input>
                             </el-form-item>
                         </div>
-                        </div>
                     </el-col>
                 </el-row>
                 <el-row :gutter="20" class="el-row" type="flex">
@@ -167,7 +210,6 @@
                         </div>
                     </el-col>
                 </el-row>
-
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="10" class="el-col" type="flex">
                         <div class="text item">
@@ -180,20 +222,6 @@
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="10" class="el-col" type="flex">
-                        <div class="text item">
-                            <el-form-item label="拼音码" prop="pinyinCode">
-                                <el-input
-                                    v-model="editQuery.pinyinCode"
-                                    style="width: 60%"
-                                    size="small"
-                                ></el-input>
-                            </el-form-item>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="10" class="el-col" type="flex">
                         <div class="text item">
                             <el-form-item label="往来单位类型" prop="corpType">
@@ -209,7 +237,6 @@
                         </div>
                     </el-col>
                 </el-row>
-
             </el-form>
 
             <div slot="footer" class="dialog-footer">
@@ -313,18 +340,18 @@
 </template>
 
 <script>
-import {
+    import {
         getUnitMaintain,
         addUnit,
         modifyUnit,
         deleteUnitMaintain
-} from "../../api/receipts/unitMaintain";
+    } from "../../api/receipts/unitMaintain";
-import {
+    import {
         getPlatform,
         linkPlatform
-} from "../../api/auth/platform";
+    } from "../../api/auth/platform";
 
-export default {
+    export default {
         data() {
             return {
                 query: {
@@ -359,6 +386,7 @@ export default {
                     name: null,
                     host: null
                 },
+                spellUpdate: true,
                 platformVisible: false,
                 editLoginVisible: false,
                 checked: false,
@@ -369,30 +397,27 @@ export default {
                 multipleSelection: [],
                 rules: {
                     name: [
-                    { required: true, message: "请输入往来单位名称", trigger: "change" }
+                        {required: true, message: "请输入往来单位名称", trigger: "change"}
-                ],
-                spell: [
-                    { required: true, message: "请输入往来单位简写", trigger: "change" }
                     ],
                     creditNo: [
-                    { required: true, message: "请输入社会信用号", trigger: "change" }
+                        {required: true, message: "请输入社会信用号", trigger: "change"}
                     ],
                     corpType: [
-                    { required: true, message: "请选择往来单位类型", trigger: "change" }
+                        {required: true, message: "请选择往来单位类型", trigger: "change"}
                     ],
                     pinyinCode: [
-                    { required: true, message: "请输入拼音码", trigger: "change" }
+                        {required: true, message: "请输入拼音码", trigger: "change"}
                     ]
                 },
                 platformRules: {
                     platformId: [
-                    { required: true, message: "请选择自助平台", trigger: "change" }
+                        {required: true, message: "请选择自助平台", trigger: "change"}
                     ],
                     userName: [
-                    { required: true, message: "请输入账号", trigger: "change" }
+                        {required: true, message: "请输入账号", trigger: "change"}
                     ],
                     password: [
-                    { required: true, message: "请输入密码", trigger: "change" }
+                        {required: true, message: "请输入密码", trigger: "change"}
                     ]
 
                 },
@@ -643,9 +668,10 @@ export default {
                 })
             );
         }
-};
+    };
 </script>
 
 <style>
 
+
 </style>

src/views/userManage/param/systemPDFModule.vue

@@ -120,19 +120,19 @@
                         </p>
                     </template>
                 </el-table-column>
-                <el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
+                <el-table-column label="单据类型" prop="title" 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">
+                <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.remark2"
                                   placeholder="请输入"></el-input>
                     </template>
                 </el-table-column>
-                <el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
+                <el-table-column label="备注字段2" prop="remark2" show-overflow-tooltip="true">
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
                                   placeholder="请输入"></el-input>
@@ -330,7 +330,7 @@
             :close-on-press-escape="false"
             :visible.sync="moduleFormVisible"
             :before-close="moduleHideForm"
-            width="70%"
+            width="50%"
             top="5vh"
         >
             <el-form ref="singleTable">
@@ -338,8 +338,19 @@
                           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="name" width="300"></el-table-column>
                     <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作" prop="remark" width="100">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click="previewPdf(scope.row)"
+                            >预览
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
                 </el-table>
 
                 <el-pagination
@@ -389,6 +400,7 @@ import { saveAs } from "file-saver";
 import { BASE_URL, SERVER_IP } from "../../../config/app";
 import { authRoleAuthList } from "../../../api/auth/authRole";
 import { updateStockOrderDetail } from "@/api/warehouse/stockOrder";
+import {demoPrint} from "@/api/itextpdf/itextpdf";
 
 const formJson = {
     id: "",
@@ -544,7 +556,22 @@ export default {
                 xhr.send();
             });
         },
-
+        previewPdf(row) {
+            let query = {id: row.id};
+            demoPrint(query).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;
+            });
+        },
         jumpDl(row) {
             this.handleDownload(BASE_URL + "/udiwms/donwload/file?fileName=" + row.templateDlUrl, row.name + ".jrxml");
         },

src/views/userManage/param/systemPDFTemplate.vue

@@ -71,8 +71,6 @@
                         >预览
                         </el-button
                         >
-
-
                     </template>
                 </el-table-column>
             </el-table>
@@ -326,7 +324,7 @@ import {
 import {BASE_URL, SERVER_IP} from "../../../config/app";
 import {authRoleAuthList} from "../../../api/auth/authRole";
 import {saveAs} from 'file-saver';
-import {demoPrint, stockOrderPDFFromTemplateFile} from "@/api/itextpdf/itextpdf";
+import {demoPrint} from "@/api/itextpdf/itextpdf";
 
 const formJson = {
     id: "",
@@ -739,19 +737,6 @@ export default {
                             }
                             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;

src/views/userManage/param/systemParamConfig.vue

@@ -35,8 +35,13 @@
                             size="small"
                             @click.native="handleForm(scope.$index, scope.row)"
                         >设置
-                        </el-button
+                        </el-button>
-                        >
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native="deleteParam(scope.$index, scope.row)"
+                        >删除
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -132,14 +137,15 @@
 </template>
 
 <script>
-import {
+    import {
         systemParamConfigList,
         systemParamConfigSave,
         getCustomizeParams,
-    addCustomizeParam
+        addCustomizeParam,
-} from "../../../api/param/systemParamConfig";
+        deleteParam
+    } from "../../../api/param/systemParamConfig";
 
-const formJson = {
+    const formJson = {
         id: "",
         parentId: "",
         paramName: "",
@@ -149,8 +155,8 @@ const formJson = {
         paramType: 1,
         paramExplain: "",
         customerId: null
-};
+    };
-export default {
+    export default {
         data() {
             return {
                 query: {
@@ -176,7 +182,7 @@ export default {
                 formData: formJson,
                 formRules: {
                     paramValue: [
-                    { required: true, message: "请输入参数值", trigger: "blur" }
+                        {required: true, message: "请输入参数值", trigger: "blur"}
                     ]
                     // ,
                     // paramStatus: [
@@ -290,7 +296,7 @@ export default {
             //添加自定义参数弹窗
             addCustomizeParam() {
                 this.addParamVisible = true;
-            let query = { customerId: this.$store.getters.customerId};
+                let query = {customerId: this.$store.getters.customerId};
                 getCustomizeParams(query).then((res) => {
                     this.customizeParamList = res.data || [];
                 }).catch((error) => {
@@ -309,6 +315,31 @@ export default {
                 }).catch((error) => {
                     this.$message.error(error.message);
                 });
+            },
+            //删除参数
+            deleteParam(index, row) {
+                this.$confirm('是否确认删除此参数?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    let data = {id: row.id};
+                    deleteParam(data).then((res) => {
+                        this.getList();
+                        this.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                    }).catch((error) => {
+                        this.$message.error("删除失败");
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });
+                });
+
             }
         },
         filters: {
@@ -333,7 +364,7 @@ export default {
             // 加载表格数据
             this.getList();
         }
-};
+    };
 </script>
 
 <style type="text/scss" lang="scss">

src/views/warehouse/stockOrderDelSearch.vue

@@ -787,6 +787,11 @@
                 });
             },
             uploadSpms(row) {
+                this.$confirm('是否确认提交到 “' + row.fromCorp + '” 的UDI自助平台？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
                     let orderIds = [];
                     orderIds.push(row.orderId);
                     let query = {orderIds: orderIds};
@@ -802,6 +807,13 @@
                         })
                         .catch(() => {
                         });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });
+                });
+
             }
         },
         components: {