From 0fc3fa2f6d7cb0492f794a8b83b8a50916365f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 10 Mar 2023 10:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=A2=E5=86=85=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue        | 23 +++-----
 src/views/basic/product/productUdiType.vue | 62 ++++++++++++++++++++--
 2 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index f49e310c..f49b27b1 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -9,12 +9,7 @@
                      @node-click="handleNodeClick"
                      :expand-on-click-node="false">
                  <span class="custom-tree-node" slot-scope="{ node, data }">
-                   <span style="">{{ node.label }}</span>
-                     <span v-if="data.code!=10000">
-                       <el-button style="margin-left: 20px;" type="text"  @click="() => addHospProduct(data)">绑定</el-button>
-                       <el-button type="text" @click="() => removeHospProduct(data)">解绑</el-button>
-                     </span>
-                 </span>
+                   <span style="font-size: 15px;font-weight: 500;">{{ node.label }}</span></span>
             </el-tree>
           </div>
         </el-col>
@@ -1074,14 +1069,13 @@
               @closeUdi="closeUdi"
             ></selectUdiVersion>
           </el-dialog>
-          <el-pagination
-            :page-size="filterQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
+          <pagination
+            v-show="total>0"
             :total="total"
-            :current-page="filterQuery.page"
-          ></el-pagination>
-
+            :limit.sync="filterQuery.limit"
+            :page.sync="filterQuery.page"
+            @pagination="handleCurrentChange"
+          ></pagination>
 
           <el-dialog
             title="编辑-耗材菜单"
@@ -1158,7 +1152,6 @@ import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
 import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
 
-
 export default {
   data() {
     return {
@@ -1530,7 +1523,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
     handleModifyClick(row) {
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index 6b3ea6c8..fb8e1e7c 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -30,8 +30,10 @@
         <el-table-column prop="code" label="编码"></el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button type="text"  @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
-            <el-button type="text"  @click.native.stop="handleDelInv(scope.row)">删除</el-button>
+            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
+            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
+            <el-button type="text" v-if="scope.row.code!=10000"  @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
+            <el-button type="text" v-if="scope.row.code!=10000"   @click.native.stop="removeHospProduct(scope.row)">解绑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -92,7 +94,35 @@
         </div>
       </el-dialog>
     </el-card>
+    <el-dialog
+      title="绑定-耗材产品"
+      :visible.sync="selectHospProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      append-to-body
+      v-if="selectHospProductVisible"
+    >
+      <selectHospProduct
+        :closeDialog="closeDialog"
+        :rId="rId"
+      ></selectHospProduct>
+    </el-dialog>
 
+    <el-dialog
+      title="解绑-耗材产品"
+      :visible.sync="selectUnBindHospProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      append-to-body
+      v-if="selectUnBindHospProductVisible"
+    >
+      <selectUnBindHospProduct
+        :closeDialog="closeDialog"
+        :rId="rId"
+      ></selectUnBindHospProduct>
+    </el-dialog>
 
   </div>
 </template>
@@ -102,6 +132,9 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect";
 import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType} from "@/api/basic/basicHospType";
 
+import selectHospProduct from "@/views/basic/product/bindHospProduct";
+import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
+
 
 export default {
   data() {
@@ -129,6 +162,7 @@ export default {
       currentRow: {name: "仓库"},
       mutiInvMode: true,
       subFormVisible: false,
+      rId:null,
       subData: {},
       fromDeptOptions: [],
       thirdSubQuery: {
@@ -141,6 +175,9 @@ export default {
       thrSubWareHouseVisible: false,
       thrSubWarehouseData: [],
       checkSubThrWarehouseRow: null,
+      selectHospProductVisible: false,
+      selectUnBindHospProductVisible:false,
+
       subTotal: 0,
       sysList: [],
       sysSubList: [],
@@ -288,13 +325,28 @@ export default {
           });
       }
     },
-
-
+    addHospProduct(data) {
+      this.rId = data.code
+      this.selectHospProductVisible = true;
+    },
+    removeHospProduct(data){
+      this.rId = data.code
+      this.selectUnBindHospProductVisible = true;
+    },
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.selectVersionVisible = false;
+      this.selectHospProductVisible=false;
+      this.selectUnBindHospProductVisible=false;
+    },
   },
   mounted() {
   },
   components: {
-    Treeselect
+    Treeselect,
+    selectHospProduct,
+    selectUnBindHospProduct
   },
   created() {
     this.getList();