From b0da7d87fd3d12fcdfc074f43b09b38e80a2fbd2 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 29 Mar 2022 16:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=EF=BC=8C=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E5=90=88=E5=B9=B6=E5=8D=95=E6=8D=AE?=
 =?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/api/param/systemPDFTemplate.js            |  1 +
 src/views/basic/UdiInfoManage.vue             |  8 ++-
 src/views/basic/UdiInfoSelectLocalUdi.vue     | 10 ++--
 src/views/basic/UdiInfoselectErpUdi.vue       | 15 +++--
 .../userManage/param/systemPDFModule.vue      | 55 ++++++++++++++++++-
 src/views/warehouse/DialogSelectUnit.vue      | 29 +++++++---
 src/views/warehouse/errorCode.vue             | 24 ++++----
 7 files changed, 107 insertions(+), 35 deletions(-)

diff --git a/src/api/param/systemPDFTemplate.js b/src/api/param/systemPDFTemplate.js
index c60fcb7..53848dd 100644
--- a/src/api/param/systemPDFTemplate.js
+++ b/src/api/param/systemPDFTemplate.js
@@ -38,6 +38,7 @@ export function updateDetailRel(query) {
 }
 
 
+
 export function getSystemPDFModules(query) {
     return axios({
         url: "/system/pdf/module/pdfModules",
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index c556f0f..2d3f190 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -57,7 +57,7 @@
                     <el-form-item>
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                            <el-button type="primary" icon="search" @click="submit">查询</el-button>
                             <el-button type="primary" icon="search" @click="intentDetail"
                             >关联选入
                             </el-button>
@@ -857,9 +857,13 @@ export default {
             };
             this.getList();
         },
-        getList() {
+        submit(){
             this.loading = true;
             this.filterQuery.page = 1;
+            this.getList();
+        },
+        getList() {
+
             getUdiInfos(this.filterQuery)
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/basic/UdiInfoSelectLocalUdi.vue b/src/views/basic/UdiInfoSelectLocalUdi.vue
index 1625193..97e1f9f 100644
--- a/src/views/basic/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/UdiInfoSelectLocalUdi.vue
@@ -45,6 +45,7 @@
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-input
+                                :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
                                 v-model="unionQuery.cpmctymc" clearable="true"
                                 size="mini"
                                 placeholder="器械通用名称"
@@ -58,7 +59,7 @@
                         <el-form-item class="query-form-item">
                             <el-input
                                 v-model="unionQuery.ggxh" clearable="true"
-                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
                                 placeholder="规格型号"
                                 size="mini"
                             ></el-input>
@@ -66,7 +67,7 @@
                         <el-form-item class="query-form-item">
                             <el-input
                                 v-model="unionQuery.zczbhhzbapzbh" clearable="true"
-                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+                                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
                                 placeholder="注册证/备案号"
                                 size="mini"
                             ></el-input>
@@ -537,7 +538,7 @@ export default {
                         //         this.$emit("closeUdi", false);
                         //     });
                     } else if (response.code == 499) {
-                        this.$confirm(response.message,{type:"warning"})
+                        this.$confirm(response.message, {type: "warning"})
                             .then(_ => {
                                 this.combine();
                                 // combineUdi(this.combineQuery)
@@ -554,7 +555,8 @@ export default {
                                 //         this.$emit("closeUdi", false);
                                 //     });
                             })
-                            .catch(_ => {});
+                            .catch(_ => {
+                            });
                     }
                 })
                 .catch(() => {
diff --git a/src/views/basic/UdiInfoselectErpUdi.vue b/src/views/basic/UdiInfoselectErpUdi.vue
index e527a3d..d64c112 100644
--- a/src/views/basic/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/UdiInfoselectErpUdi.vue
@@ -2,12 +2,6 @@
 
 
     <div>
-        <!--<div v-if="isImport">-->
-            <!--<el-checkbox v-model="combineQuery.isRlInv" class="checkitemTag"-->
-            <!--&gt;全部选入时是否根据库存信息过滤-->
-            <!--</el-checkbox-->
-            <!--&gt;-->
-        <!--</div>-->
         <el-card class="el-card">
             <div>
                 <el-form :inline="true" :model="erpQuery" style="display: flex;" size="mini">
@@ -47,6 +41,13 @@
                                 @keyup.enter.native="keyup_submit($event)"
                             ></el-input>
                         </el-form-item>
+                        <el-form-item class="query-form-item">
+                            <el-input
+                                v-model="erpQuery.supName" clearable="true"
+                                placeholder="配送企业"
+                                @keyup.enter.native="keyup_submit($event)"
+                            ></el-input>
+                        </el-form-item>
 
                         <el-form-item class="query-form-item">
                             <el-select v-model="thirdSysFk" placeholder="请设置主系统" disabled="isImport">
@@ -100,6 +101,7 @@
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
                     <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+                    <el-table-column label="配送企业" prop="supName"></el-table-column>
                 </el-table>
                 <el-pagination
                     :page-size="erpQuery.limit"
@@ -352,6 +354,7 @@
                     registerNo: null,
                     manufactory: null,
                     thirdSys: null,
+                    supName:null,
                     page: 1,
                     limit: 10,
 
diff --git a/src/views/userManage/param/systemPDFModule.vue b/src/views/userManage/param/systemPDFModule.vue
index f83f456..40d6cf3 100644
--- a/src/views/userManage/param/systemPDFModule.vue
+++ b/src/views/userManage/param/systemPDFModule.vue
@@ -98,7 +98,7 @@
             <el-table v-loading="loading" :data="list" style="width: 100%">
                 <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="模板名称">
+                <el-table-column label="模板名称" width="200">
                     <template slot-scope="scope">
                         <p v-if="scope.row.templateName === null">
                             <el-button
@@ -120,6 +120,41 @@
                         </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" fixed="right">
+                    <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="接口参数设置"
@@ -352,11 +387,12 @@ import {
     systemPDFTemplateDeleteById,
     systemPDFModuleList,
     systemPDFModuleSave, updateDetailRel,
-    getSystemPDFModules, moduleDetail
+    getSystemPDFModules, moduleDetail, updatePdfRelData
 } from "../../../api/param/systemPDFTemplate";
 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";
 
 const formJson = {
     id: "",
@@ -435,6 +471,7 @@ export default {
                     {required: true, message: "请选择所属模块", trigger: "blur"}
                 ]
             },
+            currentCheckIndex: -1,
             deleteLoading: false,
             uploadUrl: "",
             fileList: [],
@@ -837,6 +874,20 @@ export default {
                 .catch(() => {
                 });
         },
+
+        handleEdit(index, row) {
+            this.currentCheckIndex = index;
+            console.log(this.currentCheckIndex)
+        },
+        handleSave(index, row) {
+            this.currentCheckIndex = -1;
+            updateDetailRel(row).then((res) => {
+                if (res.code == 20000) {
+                    this.$message.success(res.data);
+                }
+            })
+        },
+
     },
     filters: {
         paramStatusFilterType(paramStatus) {
diff --git a/src/views/warehouse/DialogSelectUnit.vue b/src/views/warehouse/DialogSelectUnit.vue
index 80f05f6..64e605b 100644
--- a/src/views/warehouse/DialogSelectUnit.vue
+++ b/src/views/warehouse/DialogSelectUnit.vue
@@ -12,13 +12,13 @@
                 >查询
                 </el-button
                 >
-                <el-button
-                    type="primary"
-                    icon="search"
-                    @click.native.stop="selectUnit()"
-                >确定
-                </el-button
-                >
+<!--                <el-button-->
+                <!--                    type="primary"-->
+                <!--                    icon="search"-->
+                <!--                    @click.native.stop="selectUnit()"-->
+                <!--                >确定-->
+                <!--                </el-button-->
+                <!--                >-->
             </el-form-item>
         </el-form>
 
@@ -51,6 +51,17 @@
             ></el-table-column>
             <el-table-column label="状态" prop="status"></el-table-column>
             <el-table-column label="类型" prop="type"></el-table-column>
+            <el-table-column width="200" label="操作" fixed="right">
+                <template slot-scope="scope">
+
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.native.stop="selectUnit(scope.row)"
+                    >选入绑定
+                    </el-button>
+                </template>
+            </el-table-column>
         </el-table>
     </div>
 </template>
@@ -112,8 +123,8 @@ export default {
         handleDetail(row) {
             this.curUnitRow = row;
         },
-        selectUnit() {
-            this.$emit("selectSupUnit", this.curUnitRow);
+        selectUnit(row) {
+            this.$emit("selectSupUnit", row);
             this.$emit("closeBindDialog", true);
         },
     },
diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue
index bea5c41..ad16e5f 100644
--- a/src/views/warehouse/errorCode.vue
+++ b/src/views/warehouse/errorCode.vue
@@ -11,10 +11,10 @@
                     >查询
                     </el-button
                     >
-<!--                    <el-button type="primary" icon="search" @click="deleteDialog"-->
-<!--                    >删除-->
-<!--                    </el-button-->
-<!--                    >-->
+                    <el-button type="primary" icon="search" @click="deleteDialog"
+                    >删除
+                    </el-button
+                    >
                 </el-button-group>
             </el-form-item>
         </el-form>
@@ -27,7 +27,7 @@
             tooltip-effect="dark"
             @selection-change="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" fixed></el-table-column>
             <!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
             <el-table-column label="条码" prop="code" fixed></el-table-column>
@@ -52,13 +52,13 @@
 
             <el-table-column label="操作" fixed="right" width="250">
                 <template slot-scope="scope">
-                    <el-button
-                        type="text"
-                        size="small"
-                        @click.native.stop="deleteCode(scope.$index, scope.row)"
-                    >删除
-                    </el-button
-                    >
+<!--                    <el-button-->
+                    <!--                        type="text"-->
+                    <!--                        size="small"-->
+                    <!--                        @click.native.stop="deleteCode(scope.$index, scope.row)"-->
+                    <!--                    >删除-->
+                    <!--                    </el-button-->
+                    <!--                    >-->
                     <el-button
                         type="text"
                         size="small"