dev

src/components/inventory/purchase/EditOrder.vue

@@ -1,4 +1,6 @@
 <template>
+  <Mask :width="1200" :top="100" :is-show="isShow" @close="exit"
+        title="编辑" :height="720" :show-footer="true">
     <div class="edit-panel" v-loading="isLoading" element-loading-text="正在保存......">
       <div class="top">
         <el-form :model="inventory_order_data" label-position="top" ref="orderForm">
@@ -175,6 +177,8 @@
 
         </el-table>
       </div>
+    </div>
+    <template #footer>
       <div class="bottom">
         <div class="totalPrice">
           订单总金额：<span style="color: #FF282E;font-size: 12px">￥</span><span
@@ -185,7 +189,9 @@
           <el-button type="primary" @click="exit">关闭</el-button>
         </div>
       </div>
-  </div>
+    </template>
+  </Mask>
+
 
   <Mask :is-show="is_add" :top="100">
     <Edit ref="editRef" @close="is_add = false;"/>
@@ -202,7 +208,7 @@ import {ElMessage, ElMessageBox} from "element-plus";
 import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
 import CloseBtn from "@/components/CloseBtn.vue";
 
-let props = defineProps({
+const props = defineProps({
   code: {
     type: String,
     default: ""
@@ -291,10 +297,14 @@ const saveOrderEdit = () => {
   })
 
 }
-onMounted(() => {
+const isShow = ref<any>(false)
+const code = ref<any>('')
+const init = (e: any) => {
+  code.value = e
+  isShow.value = true
   getSupplierList()
   getOrderDetail()
-})
+}
 const getTotalPrice = () => {
   let totalPrice = 0;
   table_list.value.forEach((item: any) => {
@@ -304,6 +314,7 @@ const getTotalPrice = () => {
 }
 const emit = defineEmits(['close', 'updateOrderDetail'])
 let exit = () => {
+  isShow.value = false
   emit('close')
 }
 const table_list: any = ref([])
@@ -331,7 +342,7 @@ const getSupplierList = () => {
   })
 }
 const getOrderDetail = () => {
-  post("inventory/order/detail", {code: props.code}).then((res: any) => {
+  post("inventory/order/detail", {code: code.value}).then((res: any) => {
     inventory_order_data.value = res.inventoryOrder
     table_list.value = res.inventoryOrderGoodsList
   })
@@ -387,7 +398,7 @@ const goodsSelectCallBack = (inventory: any) => {
   }, 200)
 }
 
-
+defineExpose({init})
 </script>
 <style scoped lang="scss">
 .link {
@@ -428,7 +439,38 @@ const goodsSelectCallBack = (inventory: any) => {
 .active {
   background-color: red;
 }
+.edit-panel {
+  height: 562px;
+  padding: 24px 24px 0;
+  display: flex;
+  flex-direction: column;
 
+  .top {
+    height: 180px;
+  }
+
+  .table_content {
+    flex: 1;
+    margin-top: 24px;
+    display: flex;
+    flex-direction: column;
+
+    .add_goods {
+      height: 90px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-weight: 800;
+      font-size: 18px;
+      color: #333333;
+      font-style: normal;
+
+      .search {
+        width: 50%;
+      }
+    }
+  }
+}
 .bottom {
   height: 86px;
   display: flex;
@@ -439,30 +481,23 @@ const goodsSelectCallBack = (inventory: any) => {
   color: #333333;
   font-style: normal;
   background: #fff;
-  box-shadow: 0px -2 4px 0px rgba(0,0,0,0.1);
+  box-shadow: 0px -2 4px 0px rgba(0, 0, 0, 0.1);
   border-radius: 0 0 8px 8px;
 }
 
 .error {
   background-color: #F00;
 }
-.edit-panel{
+
-  margin-top: 24px;
+.bottom {
-}
+  padding: 0 24px;
-.table_content{
+  height: 100%;
-  margin-top: 24px;
-  .add_goods{
-    height: 80px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-    font-weight: 800;
+  font-weight: 400;
-    font-size: 18px;
+  font-size: 22px;
   color: #333333;
   font-style: normal;
-    .search{
-      width: 50%;
-    }
-  }
 }
 </style>

src/components/manger/Auth.vue

@@ -15,13 +15,6 @@
       </div>
     </el-form>
     <el-descriptions title="解析后的数据" size="small" :column="2" border>
-      <!--      <el-descriptions-item-->
-      <!--          align="center"-->
-      <!--          label="定点机构编码"-->
-      <!--          :span="2"-->
-      <!--      >-->
-      <!--        {{ decryptedText.fixmedinsCode }}-->
-      <!--      </el-descriptions-item>-->
       <el-descriptions-item
           align="center"
           label="证书创建时间"
@@ -38,13 +31,13 @@
           align="center"
           label="权限"
       >
-        {{ decryptedText.rule == 1 ? "禁用医保" : decryptedText.rule == 2 ? "全部开放" : "" }}
+        {{ decryptedText.rule == 1 ? "禁用医保" : decryptedText.rule == 2 ? "全部开放" : "暂无" }}
       </el-descriptions-item>
       <el-descriptions-item
           align="center"
           label="定点机构编码"
       >
-        {{ decryptedText.fixmedinsCode}}
+        {{ decryptedText.fixmedinsCode||'无'}}
       </el-descriptions-item>
     </el-descriptions>
   </div>

src/views/inventory/inventory.vue

@@ -47,10 +47,7 @@
       </div>
     </div>
     <AddOrder ref="addOrderRef" @close="closeAddOrder"/>
-    <Mask :width="1200" :top="100" :is-show="is_edit" @close="closeEditOrder"
+    <EditOrder ref="editOrderRef" @close="closeEditOrder" @updateOrderDetail="init"/>
-          title="编辑" :height="720">
-      <EditOrder :code="open_code" @close="closeEditOrder" @updateOrderDetail="init"/>
-    </Mask>
   </div>
 </template>
 
@@ -76,9 +73,11 @@ const openAdd = () => {
     addOrderRef.value.init()
   })
 }
+const editOrderRef = ref<any>('')
 let open_edit = (row: any) => {
-  is_edit.value = true
+  nextTick(() => {
-  open_code.value = row.code
+    editOrderRef.value.init(row.code)
+  })
 }