采购订单受理骨科订单修改

src/api/orderManage-sup/orthopedics.js

@@ -0,0 +1,216 @@
+import request from "@/utils/request";
+// 骨科受理 出库
+export function selectSpdList(data) {
+    return request({
+        url:"/web/mcsList/selectSpdList",
+        method:"post",
+        data
+    })
+}
+// 采购订单受理查询待确认--供应商端
+export function getMcsOrdPageSpler(data) {
+    return request({
+        url:"/web/purcOrd/getMcsOrdPageSpler",
+        method:"post",
+        data
+    })
+}
+//  采购订单受理查询待确认详情--供应商端
+export function getMcsDetlList(data) {
+    return request({
+        url:"/web/purcOrd/getMcsDetlList",
+        method:"post",
+        data
+    })
+}
+// 采购订单受理查询待确认 受理确认
+export function acpMcsOrd(data) {
+    return request({
+        url:"/web/purcOrd/acpMcsOrd",
+        method:"post",
+        data
+    })
+}
+
+// 采购订单-已确认
+export function getMcsOrdPageYqrSpler(data) {
+    return request({
+        url:"/web/purcOrd/getMcsOrdPageYqrSpler",
+        method:"post",
+        data
+    })
+}
+
+// 供应商采购订单（待出库）
+export function getMcsOrdDck(data) {
+    return request({
+        url:"/web/purcOrd/getMcsOrdDck",
+        method:"post",
+        data
+    })
+} 
+// 结束订单 /web/delvOrd/finishMcsDelvOrd
+export function finishMcsDelvOrd(data) {
+    return request({
+        url:"/web/delvOrd/finishMcsDelvOrd",
+        method:"post",
+        data
+    })
+} 
+// 供应商采购订单（待出库详情）
+export function getMcsOrdDckDetl(data) {
+    return request({
+        url:"/web/purcOrd/getMcsOrdDckDetl",
+        method:"post",
+        data
+    })
+}
+
+// 供应商采购订单-出库操作
+export function submitMcsDelvOrd(data) {
+    return request({
+        url:"/web/delvOrd/submitMcsDelvOrd",
+        method:"post",
+        data
+    })
+}
+
+// 供应商采购订单-已出库汇总
+export function getSplerMcsDelvOrdPage(data) {
+    return request({
+        url:"/web/delvOrd/getSplerMcsDelvOrdPage",
+        method:"post",
+        data
+    })
+}
+// 供应商采购订单-已出库详情
+export function getOrdDetlList(data) {
+    return request({
+        url:"/web/delvOrd/getMcsDetlList",
+        method:"post",
+        data
+    })
+}
+// /web/purcOrd/getMcsPurcOrdMx 提取订单
+export function getMcsPurcOrdMx(data) {
+    return request({
+        url:"/web/purcOrd/getMcsPurcOrdMx",
+        method:"post",
+        data
+    })
+}
+// 骨科
+
+
+
+
+
+
+
+
+
+// 采购订单受理
+export function acpOrd(data) {
+    return request({
+        url:"/web/purcOrd/acpOrd",
+        method:"post",
+        data
+    })
+}
+// 采购订单出库查询
+// export function getOrdPageSplerUnStoOut(data) {
+//     return request({
+//         url:"/web/purcOrd/getOrdPageSplerUnStoOut",
+//         method:"post",
+//         data
+//     })
+// }
+
+// 采购订单出库--保存出库信息
+export function saveDelvOrd(data) {
+    return request({
+        url:"/web/delvOrd/saveDelvOrd",
+        method:"post",
+        data
+    })
+}
+// 采购订单出库--提交出库信息
+export function submitDelvOrd(data) {
+    return request({
+        url:"/web/delvOrd/submitDelvOrd",
+        method:"post",
+        data
+    })
+}
+// 采购订单出库--结束订单
+export function finishDelvOrd(data) {
+    return request({
+        url:"/web/delvOrd/finishDelvOrd",
+        method:"post",
+        data
+    })
+}
+// 已出库订单查询
+export function getSplerDelvOrdPage(data) {
+    return request({
+        url:"/web/delvOrd/getSplerDelvOrdPage",
+        method:"post",
+        data
+    })
+}
+// 已出库订单明细查询
+export function getDetlList(data) {
+    return request({
+        url:"/web/delvOrd/getDetlList",
+        method:"post",
+        data
+    })
+}
+// 票据查询
+export function getBillPage(data) {
+    return request({
+        url:"/web/billFile/getBillPage",
+        method:"post",
+        data
+    })
+}
+// 药品退货列表
+export function getRetnOrdInfo(data) {
+    return request({
+        url:"/web/stroom/getRetnOrdInfo",
+        method:"post",
+        data
+    })
+}
+// 药品退货受理/驳回
+export function acpRetnOrd(data) {
+    return request({
+        url:"/web/stroom/acpRetnOrd",
+        method:"post",
+        data
+    })
+}
+// 配送企业药品退货记录查询
+export function getRetnOrdSplerPage(data) {
+    return request({
+        url:"/web/stroom/getRetnOrdSplerPage",
+        method:"post",
+        data
+    })
+}
+//查询页面机构查询条件接口
+export function getALLOrgList(data) {
+    return request({
+        url:"/web/org/getALLOrgList",
+        method:"post",
+        data
+    })
+}
+//查询医院列表(树结构)
+export function getALLOrgTree(data) {
+    return request({
+        url:"/web/org/getALLOrgTree",
+        method:"post",
+        data
+    })
+}

src/router/index.js

@@ -18,6 +18,7 @@ import consumRouter from "./modules/consumcata"; //目录管理
 import settlementRouter from "./modules/settlement"; //采购结算---业务对账
 import invoiceRouter from "./modules/invoiceManage"; //采购结算---采购发票管理
 import paymentStatusRouter from "./modules/paymentStatus" //付款状态查询--消耗明细
+import mainrTenanceRouter from "./modules/mainrTenance" //申领模板维护
 // returnRouter
 
 export const constantRoutes = [
@@ -91,6 +92,7 @@ export const asyncRoutes = [
   settlementRouter,
   invoiceRouter,
   paymentStatusRouter,
+  mainrTenanceRouter,
   { path: "*", redirect: "/404", hidden: true }
 ];
 

src/router/modules/mainrTenance.js

@@ -0,0 +1,24 @@
+/** When your routing table is too long, you can split it into small modules**/
+//  申领手术包 新增模板 
+import Layout from "@/layout";
+
+const mainrTenanceRouter = {
+  path: "/mainrTenance-sup",
+  component: Layout,
+  name: "mainrTenance-sup1",
+  meta: { title: "新增模板", icon: "" },
+  alwaysShow: true,
+  hidden: true,
+  children: [
+    {
+      // 新增模板
+      path: "indexDetail",
+      component: () => import("@/views/page/mainrTenance-sup/templateDetail/indexDetail.vue"),
+      name: "indexDetail",
+      meta: { title: "新增模板", icon: "" },
+      hidden: true
+    },
+  ]
+};
+
+export default mainrTenanceRouter;

src/router/modules/order.js

@@ -34,14 +34,6 @@ const orderRouter = {
       meta: { title: "采购订单-待出库详情", icon: "" },
       hidden: true
     },
-    // {
-    //   // 采购订单-待出库详情
-    //   path: "udiDetail",
-    //   component: () => import("@/views/page/orderManage-sup/purOrderDelivery/udiDetail.vue"),
-    //   name: "udiDetail",
-    //   meta: { title: "采购订单-待出库详情", icon: "" },
-    //   hidden: true
-    // },
     {
       // 采购订单-已出库详情
       path: "alreadyDetail",
@@ -50,7 +42,14 @@ const orderRouter = {
       meta: { title: "采购订单-已出库详情", icon: "" },
       hidden: true
     },  
-
+    {
+      // 骨科订单-待确认详情
+      path: "orthacceptDetail",
+      component: () => import("@/views/page/orderManage-sup/orthOpedicAccept/acceptDetail.vue"),
+      name: "acceptDetail",
+      meta: { title: "骨科订单受理-待确认详情", icon: "" },
+      hidden: true
+    },
   ]
 };
 

src/utils/menu/systemMenu.js

@@ -743,6 +743,32 @@ const systemMenuObj = [
     hidden: 0
   },
 
+  //申领模板维护 跟台手术包
+  {
+    component: "Layout",
+    icon: "el-icon-s-claim",
+    id: "mainrTenance-sup",
+    menuType: "MENU",
+    name: "MainrTenance-sup",
+    parentId: "0",
+    redirect: "",
+    remark: "申领模板维护-跟台手术包",
+    router: "/mainrTenance-sup",
+    hidden: 0
+  },
+  {
+    component: "/page/mainrTenance-sup/templateDetail/Surgicalbag",
+    icon: "",
+    id: "Surgicalbag",
+    menuType: "MENU",
+    name: "Surgicalbag",
+    parentId: "mainrTenance-sup",
+    redirect: "",
+    remark: "申领模板维护-跟台手术包",
+    router: "Surgicalbag",
+    hidden: 0
+  },
+
   // 两票管理---供应商端
   {
     component: "Layout",

src/views/page/consumCataManage-sup/catalogdetails.vue

@@ -214,6 +214,7 @@
                 v-model="infoData.isFas"
                 placeholder="请选择是否集采"
                 clearable
+                @change="clearType"
               >
                 <el-option
                   v-for="item in iFjcData"
@@ -225,7 +226,7 @@
             </el-form-item>
           </div>
           <div class="flex-css">
-            <el-form-item label="带量批次" prop="fasBtch">
+            <el-form-item label="带量批次" prop="fasBtch" v-if="infoData.isFas == '1'">
               <div class="content" v-if="isShow">
                 {{ infoData.fasBtch }}
               </div>
@@ -579,7 +580,9 @@ export default {
           this.$message.error("获取数据失败");
         });
     },
-
+    clearType() {
+      this.infoData.fasBtch = "";
+    },
     // 信息保存
     handleSave() {
       // this.$refs["planForm"].validate((valid) => {
@@ -617,7 +620,7 @@ export default {
       this.$refs["planForm"].validate((valid) => {
         if (valid) {
           this.$confirm("确认提交", "提示", {
-            confirmButtonText: "确定",
+            confirmButtonext: "确定",
             cancelButtonText: "取消",
             type: "warning",
           })

src/views/page/mainrTenance-sup/templateDetail/Surgicalbag.vue

@@ -0,0 +1,264 @@
+<template>
+  <!-- 退货 -->
+  <div style="display: flex">
+    <el-card style="width: 18%; margin-right: 18px; border-radius: 6px">
+      <el-tabs v-model="activeNametree" type="card" @tab-click="tabClick" stretch>
+        <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
+        <el-tab-pane label="按机构" name="org"></el-tab-pane>
+      </el-tabs>
+      <el-tree
+        :data="data"
+        :props="defaultProps"
+        node-key="spdId"
+        @node-click="handleNodeClick"
+        default-expand-all="true"
+        style="margin-top: 10px"
+      >
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{ node.label }}</div>
+          <div class="redTit">{{ data.wqrnum }}</div>
+        </span>
+      </el-tree>
+    </el-card>
+    <div class="right-common-box">
+      <el-form :model="listQuery" ref="queryForm" :inline="true">
+        <el-form-item label="模板名称" prop="id">
+          <el-input v-model="listQuery.id" placeholder="请输入模板名称"></el-input>
+        </el-form-item>
+        <el-form-item label="适用手术" prop="stas">
+          <el-select v-model="listQuery.stas" placeholder="请选择" clearable>
+            <el-option
+              v-for="item in stasOptions"
+              :key="item.value"
+              :label="item.lable"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="适用科室" prop="stas">
+          <el-select v-model="listQuery.stas" placeholder="请选择" clearable>
+            <el-option
+              v-for="item in stasOptions"
+              :key="item.value"
+              :label="item.lable"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="制作时间" prop="docmkDate">
+          <el-date-picker
+            v-model="listQuery.docmkDate"
+            type="daterange"
+            range-separator="至"
+            :editable="false"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="getorderData('search')">查询 </el-button>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="right-button">
+      <el-button type="primary" @click="handleAdd"
+        >新增模板</el-button
+      >
+    </div>
+      <el-table
+        v-loading="listLoading"
+        element-loading-text="加载中"
+        :data="list"
+        fit
+        stripe
+        height="500"
+        border
+      >
+        <template slot="empty">
+          <img src="@/assets/nopage.png" alt />
+          <p>暂无数据</p>
+        </template>
+        <el-table-column fixed type="index" label="序号" width="60" />
+        <el-table-column label="模板名称" prop="id" />
+        <el-table-column label="模板类型" prop="detlCnt" />
+        <el-table-column label="适用手术" prop="retnCnt" />
+        <el-table-column label="适用科室" prop="retnAmt" />
+        <el-table-column label="供应商" prop="branchName" />
+        <el-table-column label="制作人" prop="docmker" />
+        <el-table-column label="制作时间" prop="docmkDate" />
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页-->
+      <yl-pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="listQuery.current"
+        :limit.sync="listQuery.size"
+        @pagination="getorderData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import ylPagination from "@/components/yl-pagination";
+import { selectRetnOrdD } from "@/api/productreturnmanage-sup/returnList";
+import { selectSpdList } from "@/api/orderManage-sup/index";
+export default {
+  components: {
+    ylPagination,
+  },
+  data() {
+    return {
+      activeNametree: "org",
+      data: [],
+      spdId: null,
+      defaultProps: {
+        children: "children",
+        label: "spdName",
+      },
+      listQuery: {
+        current: 1,
+        size: 10,
+        id: "",
+        orgId: "",
+        stas: "",
+        docmkDate: [],
+      },
+      stasOptions: [
+        { value: "A", lable: "待确认" },
+        { value: "B", lable: "已确认" },
+      ],
+      listLoading: false,
+      list: [],
+      total: 0,
+    };
+  },
+  mounted() {
+    this.getData();
+    if (this.$route.query.spdId) {
+      this.listQuery.spdId = this.$route.query.spdId;
+      selectRetnOrdD(this.listQuery)
+        .then((res) => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    }
+  },
+  methods: {
+    tabClick(tab) {
+      if (tab.label == "按机构") {
+        this.defaultProps.label = "spdName";
+      }
+      // else if(tab.label == "按分类"){
+      //     // this.getData4();
+      //     // this.defaultProps.label = 'orgGrpName'
+      //     // this.listQuery.type = 'grp';
+      // }
+    },
+    // 点击获取耗材列表
+    handleNodeClick(data) {
+      this.listLoading = true;
+      this.spdId = data.spdId;
+      this.listQuery.spdId = this.spdId;
+      selectRetnOrdD(this.listQuery)
+        .then((res) => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    },
+    // 获取医院列表
+    getData(type) {
+      this.data = [];
+      selectSpdList()
+        .then((res) => {
+          this.listQuery.spdId = res.data[0].spdId;
+          this.data = res.data;
+          console.log(this.data, "dadad");
+        })
+        .catch((err) => {});
+    },
+    getorderData(type) {
+      if (type == "search") {
+        this.listQuery.current = 1;
+      }
+      this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
+      this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
+      this.listLoading = true;
+      selectRetnOrdD(this.listQuery)
+        .then((res) => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    },
+    reset() {
+      this.$refs.queryForm.resetFields();
+      this.getorderData();
+    },
+    // 详情
+    handleDetail(row) {
+      console.log(row, "row");
+        this.$router.push({
+          name: "Surgicalbag",
+          query: {
+            id: row.id,
+            detlCnt: row.detlCnt,
+            retnCnt: row.retnCnt,
+            retnAmt: row.retnAmt,
+            branchName: row.branchName,
+            docmker: row.docmker,
+            docmkDate: row.docmkDate,
+            stas: row.stas,
+            spdId: this.spdId,
+            rejtRea: row.rejtRea,
+          },
+        });
+    },
+    handleAdd(){
+        this.$router.push({
+          name: "indexDetail",
+          query: {
+            
+            spdId: this.spdId,
+          },
+        });
+    }
+    
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.custom-tree-node {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+.custom-tree-node ::v-deep .redTit {
+  min-width: 30px;
+  background-color: #f56c6c;
+  min-height: 1px;
+  border-radius: 10px;
+  text-align: center;
+  margin-left: 10px;
+  padding: 1px;
+  color: #fff;
+}
+</style>

src/views/page/mainrTenance-sup/templateDetail/indexDetail.vue

@@ -0,0 +1,222 @@
+<template>
+  <!-- 商品退货管理————待确认 -->
+  <div>
+    <!-- <div class="right-button">
+        <el-button type="primary" @click="handleConfirm" :loading="sureLoading"
+          >确 认</el-button
+        >
+        <el-button type="danger" @click="handleRefuse" :loading="refuseLoading"
+          >拒 绝</el-button
+        >
+      </div> -->
+    <div class="common-card">
+      <h3>基本信息</h3>
+      <el-form
+        :model="listForm"
+        ref="listform"
+        label-width="237px"
+        class="grid-form-class"
+      >
+        <div class="form-body">
+          <div class="flex-css">
+            <el-form-item label="退货单号" prop="id">
+              <div class="content">
+                {{ listForm.id }}
+              </div>
+            </el-form-item>
+            <el-form-item label="退货品种" prop="detlCnt">
+              <div class="content">
+                {{ listForm.detlCnt }}
+              </div>
+            </el-form-item>
+            <el-form-item label="退货总数" prop="retnCnt">
+              <div class="content">
+                {{ listForm.retnCnt }}
+              </div>
+            </el-form-item>
+          </div>
+          <div class="flex-css">
+            <el-form-item label="退货金额" prop="retnAmt">
+              <div class="content">
+                {{ listForm.retnAmt }}
+              </div>
+            </el-form-item>
+            <el-form-item label="发起人" prop="docmker">
+              <div class="content">
+                {{ listForm.docmker }}
+              </div>
+            </el-form-item>
+            <el-form-item label="发起时间" prop="docmkDate">
+              <div class="content">
+                {{ listForm.docmkDate }}
+              </div>
+            </el-form-item>
+          </div>
+          <div class="flex-css">
+            <el-form-item label="当前状态" prop="stas">
+              <div class="content">
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="common-card">
+      <h3>退货明细</h3>
+      <el-form :model="list" ref="listRef">
+        <el-table
+          v-loading="listLoading"
+          element-loading-text="加载中"
+          :data="list"
+          fit
+          stripe
+          border
+          @selection-change="handleSelectionChange"
+        >
+          <template slot="empty">
+            <img src="@/assets/nopage.png" alt />
+            <p>暂无数据</p>
+          </template>
+          <!-- <el-table-column type="selection" width="60" /> -->
+          <el-table-column fixed type="index" label="序号" width="60" />
+          <el-table-column label="医保编码" prop="hiCode" />
+          <el-table-column label="耗材编码" prop="prodCode" />
+          <el-table-column label="耗材信息" prop="prodName" width="300">
+            <template slot-scope="scope">
+              <mcs-info :info="scope.row"></mcs-info>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格" prop="spec" />
+          <el-table-column label="型号" prop="mol" />
+          <el-table-column label="材质" prop="matl" />
+          <el-table-column label="是否集采" prop="isFas">
+            <template #default="{ row }">
+              <span v-if="row.isFas == '0'">否</span>
+              <span v-if="row.isFas == '1'">是</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="包装" prop="convrat">
+            <template #default="{ row }">
+              <span
+                >{{ row.purcUnt }} ({{ row.convrat }}{{ row.prcUnt }}/{{
+                  row.purcUnt
+                }})</span
+              >
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="采购数量" prop="purcCnt" /> -->
+          <el-table-column label="单价" prop="purcPric">
+            <template #default="{ row }">
+              <span>{{ row.retnPric }}元/{{ row.prcUnt }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="退货数量" prop="retnCnt" />
+          <el-table-column label="退货金额" prop="retnAmt" />
+        </el-table>
+        <!-- <p class="price-css">合计数量：{{}} <span></span>合计金额： {{}}</p> -->
+      </el-form>
+    </div>
+    <div class="common-card">
+      <h3>退货原因</h3>
+      <el-form
+        :model="listForm"
+        ref="listform"
+        label-width="237px"
+        class="grid-form-class"
+      >
+        <div class="form-body">
+          <div class="flex-css">
+            <el-form-item label="退货原因" prop="rejtRea">
+              <el-input v-model="listForm.rejtRea" readonly></el-input>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="foot-button">
+      <el-button type="primary" @click="handleBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import ylStep from "@/components/yl-step";
+import ylPagination from "@/components/yl-pagination";
+import mcsInfo from "@/views/components/mcs-info.vue";
+import { selectRetnDetl, acpRetnOrd } from "@/api/productreturnmanage-sup/returnList";
+
+export default {
+  components: {
+    ylStep,
+    ylPagination,
+    mcsInfo,
+  },
+  data() {
+    return {
+      listForm: {
+        id: "",
+        detlCnt: "",
+        retnCnt: "",
+        retnAmt: "",
+        branchName: "",
+        docmker: "",
+        docmkDate: "",
+        stas: "",
+        rejtRea: "",
+      },
+      stasOptions: [
+        { value: "A", lable: "待确认" },
+        { value: "B", lable: "已确认" },
+        { value: "R", lable: "已拒绝" },
+      ],
+      listLoading: false,
+      list: [],
+      //   isShow: false,
+      sureLoading: false,
+      refuseLoading: false,
+    };
+  },
+  created() {
+    this.listForm.id = this.$route.query.id;
+    this.listForm.detlCnt = this.$route.query.detlCnt;
+    this.listForm.retnCnt = this.$route.query.retnCnt;
+    this.listForm.retnAmt = this.$route.query.retnAmt;
+    this.listForm.branchName = this.$route.query.branchName;
+    this.listForm.docmker = this.$route.query.docmker;
+    this.listForm.docmkDate = this.$route.query.docmkDate;
+    this.listForm.rejtRea = this.$route.query.rejtRea;
+    this.stasOptions.forEach((i) => {
+      if (i.value == this.$route.query.stas) {
+        this.listForm.stas = i.lable;
+      }
+    });
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      this.listLoading = true;
+      selectRetnDetl({ id: this.$route.query.id })
+        .then((res) => {
+          this.list = res.data;
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    },
+    handleBack() {
+      this.$router.push({
+        name: "returnOrderAccept",
+        query: {
+          spdId: this.$route.query.spdId,
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/page/orderManage-sup/alreadyDelivery/alreadyDetail.vue

@@ -32,9 +32,9 @@
                         {{ listForm.qtySum }}
                     </div>
                 </el-form-item>
-                <el-form-item label="采购总金额" prop="docmkDate">
+                <el-form-item label="采购总金额" prop="purcAmt">
                     <div class="content">
-                        {{ listForm.docmkDate }}
+                        {{ listForm.purcAmt }}
                     </div>
                 </el-form-item>
                 <el-form-item label="来源部门" prop="deptName">
@@ -380,6 +380,7 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
                     docmkDate: "",
                     delvOrdStas: "",
                     branchName:"",
+                    purcAmt:"",
                 },
                 stasOptions: [
                     {value: 'A', lable: "未受理"},
@@ -438,7 +439,7 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
             this.listForm.docmkDate = this.$route.query.docmkDate;
             this.listForm.delvOrdStas = this.$route.query.delvOrdStas;
             this.listForm.branchName = this.$route.query.branchName
-            
+            this.listForm.purcAmt = this.$route.query.purcAmt
             // this.stasOptions.forEach((i)=>{
             //     if(i.value == this.$route.query.stas){
             //         this.listForm.purcOrdStas = i.lable

src/views/page/orderManage-sup/orthOpedicAccept/acceptDetail.vue

@@ -37,21 +37,49 @@
                 {{ listForm.purcAmt }}
               </div>
             </el-form-item>
+            <el-form-item label="采购时间" prop="docmkDate">
+              <div class="content">
+                {{ listForm.docmkDate }}
+              </div>
+            </el-form-item>
             <el-form-item label="采购员" prop="docmker">
               <div class="content">
                 {{ listForm.docmker }}
               </div>
             </el-form-item>
-            <el-form-item label="当前状态" prop="stas">
+            
+          </div>
+          <div class="flex-css">
+            <el-form-item label="手术名称" prop="stas">
+              <div class="content">
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+            <el-form-item label="手术间" prop="stas">
+              <div class="content">
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+            <el-form-item label="主治医生" prop="stas">
               <div class="content">
                 {{ listForm.stas }}
               </div>
             </el-form-item>
           </div>
           <div class="flex-css">
-            <el-form-item label="采购时间" prop="docmkDate">
+            <el-form-item label="手术日期" prop="stas">
               <div class="content">
-                {{ listForm.docmkDate }}
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+            <el-form-item label="当前状态" prop="stas">
+              <div class="content">
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+            <el-form-item label=" " prop="stas">
+              <div class="content">
+                <!-- {{ listForm.stas }} -->
               </div>
             </el-form-item>
           </div>
@@ -76,78 +104,39 @@
           <el-table-column fixed type="index" label="序号" width="60" />
           <el-table-column label="耗材编码" prop="materialId" />
           <el-table-column label="医保编码" prop="ybbm" />
-          <el-table-column label="耗材名称" prop="materialName" width="300">
+          <el-table-column label="耗材信息" width="230">
+            <template slot-scope="scope">
+                <mcs-info :info="scope.row"></mcs-info>
+            </template>
           </el-table-column>
-          <el-table-column label="商品类别" prop="prodType" />
           <el-table-column label="规格" prop="spec" />
           <el-table-column label="型号" prop="model" />
           <el-table-column label="材质" prop="matl" />
-          <el-table-column label="注册证号" prop="approveNo" width="150"/>
-          <el-table-column label="生产企业" prop="factory" width="200"/>
-          <el-table-column label="采购数量" prop="purcCnt" />
-          <el-table-column label="采购价" prop="purcPric" />
-          <el-table-column label="总金额" prop="purcAmt" />
-          <el-table-column label="采购来源" prop="deptName" />
-          <el-table-column label="订单发起人" prop="docmker" width="100" />
-          <el-table-column label="备注" prop="memo" />
-          <!-- <el-table-column label="驳回原因" prop="rejtRea" width="200">
-                    <template slot-scope="scope">
-                        <el-form-item
-                            label-width="0"
-                            class="item"
-                            :prop="scope.$index + '.rejtRea'"
-                        >
-                            <el-input placeholder="请输入" v-model="scope.row.rejtRea" :readonly="!returnInfo"></el-input>
-                        </el-form-item>
-                    </template>
-                </el-table-column> -->
-          <!-- <el-table-column label="是否驳回" width="100">
-                    <template slot-scope="scope">
-                        <el-switch v-model="scope.row.flag" @change="handleSwitch(scope.$index,scope.row)" :disabled="!isShow"></el-switch>
-                    </template>
-                </el-table-column> -->
-          <!-- <el-table-column label="操作" width="100">
-                    <template slot-scope="scope">
-                        <el-popconfirm
-                            title="是否驳回？"
-                            @confirm="handleReject(scope.row)"
-                            confirm-button-text="确定"
-                            cancel-button-text="取消"
-                            icon="el-icon-info"
-                            icon-color="red"
-                            v-if="scope.row.stas == '0'"
-                        >
-                            <el-button
-                                class="red"
-                                type="text"
-                                slot="reference"
-                                >驳回</el-button
-                            >
-                        </el-popconfirm>
-                        <el-popconfirm
-                            title="是否取消驳回？"
-                            @confirm="handleNoReject(scope.row)"
-                            confirm-button-text="确定"
-                            cancel-button-text="取消"
-                            icon="el-icon-info"
-                            icon-color="red"
-                            v-else
-                        >
-                            <el-button
-                                class="red"
-                                type="text"
-                                slot="reference"
-                                >取消驳回</el-button
-                            >
-                        </el-popconfirm>
-                    </template>
-                </el-table-column> -->
+          <el-table-column label="是否集采" prop="isFas" >
+            <template #default="{ row }">
+              <span v-if="row.isFas == '0'">否</span>
+              <span v-if="row.isFas == '1'">是</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="包装" prop="convrat" width="120px">
+            <template #default="{ row }">
+              <span>{{row.purcUnt}}  ({{row.convrat}}{{row.prcUnt}}/{{row.purcUnt}})</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="申请数量" prop="purcCnt" />
+          <el-table-column label="单价" prop="purcPric" >
+            <template #default="{ row }">
+              <span>{{row.purcPric}}元/{{row.prcUnt}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="总额" prop="purcAmt" />
         </el-table>
       </el-form>
 
       <div class="foot-button">
         <el-button type="primary" @click="handleAccept" :loading="aaLoad">确 认</el-button>
-        <el-button type="primary" @click="handleBack">取 消</el-button>
+        <el-button type="danger" @click="handleReturn" :loading="aaLoad">退 回</el-button>
+        <el-button type="info" @click="handleBack">返 回</el-button>
       </div>
     </div>
   </div>

src/views/page/orderManage-sup/orthOpedicAccept/index.vue

@@ -20,7 +20,7 @@
         <el-tab-pane label="待确认" name="first">
           <el-form :model="listQuery" ref="queryForm" :inline="true">
             <el-form-item label="采购单号" prop="id">
-              <el-input v-model="listQuery.id" placeholder="请输入采购单号"></el-input>
+              <el-input v-model="listQuery.id" placeholder="请输入申领单号"></el-input>
             </el-form-item>
             <el-form-item label="客户名称" prop="deptName">
               <el-input
@@ -28,7 +28,13 @@
                 placeholder="请输入客户名称"
               ></el-input>
             </el-form-item>
-            <el-form-item label="采购时间" prop="docmkDate">
+            <el-form-item label="手术名称" prop="deptName">
+              <el-input
+                v-model="listQuery.deptName"
+                placeholder="请输入手术名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="提交时间" prop="docmkDate">
               <el-date-picker
                 v-model="listQuery.docmkDate"
                 type="daterange"
@@ -40,16 +46,6 @@
                 style="width: 230px"
               />
             </el-form-item>
-            <!-- <el-form-item label="采购方" prop="orgId">
-                <el-cascader
-                    v-model="listQuery.orgId"
-                    :options="options"
-                    :show-all-levels='false'
-                    :props="{ expandTrigger: 'hover', value:'orgId',label:'orgName',children:'child',checkStrictly:true,emitPath:false }"
-                    clearable
-                    @change="handleChange">
-                </el-cascader>
-            </el-form-item>
             <el-form-item label="当前状态" prop="stas">
                 <el-select
                     v-model="listQuery.stas"
@@ -63,9 +59,9 @@
                         :value="item.value"
                     ></el-option>
                 </el-select>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="getData('search')">查询 </el-button>
+              <el-button type="primary" @click="getorderData('search')">查询 </el-button>
               <el-button @click="reset">重置</el-button>
             </el-form-item>
           </el-form>
@@ -74,6 +70,7 @@
             element-loading-text="加载中"
             :data="list"
             fit
+            height="500px"
             stripe
             border
           >
@@ -83,24 +80,24 @@
             </template>
             <el-table-column fixed type="index" label="序号" width="60" />
             <el-table-column label="采购单号" prop="id" />
-            <el-table-column label="采购品种" prop="detlCnt" />
-            <el-table-column label="采购总数量" prop="qtySum" />
-            <el-table-column label="采购总金额" prop="purcAmt" />
-            <el-table-column label="客户名称" prop="deptName" />
+            <el-table-column label="手术名称" prop="detlCnt" />
+            <el-table-column label="手术间" prop="qtySum" />
+            <el-table-column label="主治医生" prop="purcAmt" />
+            <el-table-column label="手术日期" prop="deptName" />
+            <el-table-column label="品总数" prop="docmker" />
+            <el-table-column label="采购总数" prop="docmker" />
+            <el-table-column label="采购金额" prop="docmker" />
+            <el-table-column label="客户名称" prop="docmker" />
+            <el-table-column label="科室" prop="docmker" />
             <el-table-column label="采购员" prop="docmker" />
             <el-table-column label="采购时间" prop="docmkDate" />
             <el-table-column label="当前状态" prop="stas">
               <template #default="{ row }">
-                <span v-if="row.stas == 'A'">未受理</span>
-                <span v-if="row.stas == 'B'">已受理</span>
-                <span v-if="row.stas == 'R'">被驳回</span>
-                <span v-if="row.stas == 'C'">已出库</span>
-                <span v-if="row.stas == 'D'">部分出库</span>
-                <span v-if="row.stas == 'Y'">已入库</span>
-                <span v-if="row.stas == 'P'">部分入库</span>
+                <span v-if="row.stas == 'A'">待确认</span>
+                <span v-if="row.stas == 'B'">已确认</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100">
+            <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
               </template>
@@ -112,13 +109,13 @@
             :total="total"
             :page.sync="listQuery.current"
             :limit.sync="listQuery.size"
-            @pagination="getData"
+            @pagination="getorderData"
           />
         </el-tab-pane>
         <el-tab-pane label="已确认" name="second">
           <el-form :model="listQueryC" ref="queryForm" :inline="true">
             <el-form-item label="采购单号" prop="id">
-              <el-input v-model="listQueryC.id" placeholder="请输入采购单号"></el-input>
+              <el-input v-model="listQueryC.id" placeholder="请输入申领单号"></el-input>
             </el-form-item>
             <el-form-item label="供应商" prop="deptName">
               <el-input
@@ -148,6 +145,7 @@
             element-loading-text="加载中"
             :data="list"
             fit
+            height="500px"
             stripe
             border
           >
@@ -168,16 +166,11 @@
               <template #default="{ row }">
                 <span v-if="row.stas == 'A'">未受理</span>
                 <span v-if="row.stas == 'B'">已受理</span>
-                <span v-if="row.stas == 'R'">被驳回</span>
-                <span v-if="row.stas == 'C'">已出库</span>
-                <span v-if="row.stas == 'D'">部分出库</span>
-                <span v-if="row.stas == 'Y'">已入库</span>
-                <span v-if="row.stas == 'P'">部分入库</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100">
+            <el-table-column label="操作" width="100" fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" @click="handleDetail1(scope.row)">详情</el-button>
+                <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -203,7 +196,7 @@ import {
   getMcsOrdPageYqrSpler,
   selectSplerMcsList,
   selectSpdList
-} from "@/api/orderManage-sup/index";
+} from "@/api/orderManage-sup/orthopedics";
 export default {
   components: {
     ylPagination,
@@ -266,6 +259,21 @@ export default {
       //     // this.listQuery.type = 'grp';
       // }
     },
+    // 获取医院列表
+    getData(type) {
+      this.data = [];
+      this.listLoading = true;
+      selectSpdList()
+        .then((res) => {
+          this.listQuery.spdId = res.data[0].spdId;
+          this.data = res.data;
+          console.log(this.data, "dadad");
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    },
     // 点击获取医院药品列表
     handleNodeClick(data) {
       console.log(data, "data");
@@ -289,55 +297,55 @@ export default {
     handleClick(tab) {
       console.log(tab.name, "name");
       if (tab.name == "first") {
-        this.getData();
+        this.getorderData();
       } else {
         this.getDataC();
       }
     },
-    // getData(type) {
-    //   if (type == "search") {
-    //     this.listQuery.current = 1;
-    //   }
-    //   this.listLoading = true;
-    //   this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
-    //   this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
-    //   getMcsOrdPageSpler(this.listQuery)
-    //     .then((res) => {
-    //       this.list = res.data.records;
-    //       this.total = res.data.total;
-    //       this.listLoading = false;
-    //     })
-    //     .catch((err) => {
-    //       this.listLoading = false;
-    //     });
-    //   // getMcsOrdPageSpler().then(res =>{
-    //   // this.options = res.data
-    //   // })
-    // },
-    // 获取医院列表
-    getData(type) {
-      this.data = [];
+    
+    getorderData(type) {
+      if (type == "search") {
+        this.listQuery.current = 1;
+      }
       this.listLoading = true;
-      selectSpdList()
+      this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
+      this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
+      getMcsOrdPageSpler(this.listQuery)
         .then((res) => {
-          this.listQuery.spdId = res.data[0].spdId;
-          this.data = res.data;
-          console.log(this.data, "dadad");
+          this.list = res.data.records;
+          this.total = res.data.total;
           this.listLoading = false;
         })
         .catch((err) => {
           this.listLoading = false;
         });
+      // getMcsOrdPageSpler().then(res =>{
+      // this.options = res.data
+      // })
     },
+    
     reset() {
       this.$refs.queryForm.resetFields();
-      this.getData();
+      this.getorderData();
     },
     // 详情
     handleDetail(row) {
-      console.log(wqwqw, "we");
-      this.$router.push({
-        path: "acceptDetail",
+      if(row.stas=="A"){
+        this.$router.push({
+          path: "orthacceptDetail",
+          query: {
+            id: row.id,
+            detlCnt: row.detlCnt,
+            qtySum: row.qtySum,
+            purcAmt: row.purcAmt,
+            docmker: row.docmker,
+            docmkDate: row.docmkDate,
+            stas: row.stas,
+          },
+        });
+      }else if(row.stas=="B"){
+        this.$router.push({
+        name: "confirmDetail",
         query: {
           id: row.id,
           detlCnt: row.detlCnt,
@@ -348,6 +356,7 @@ export default {
           stas: row.stas,
         },
       });
+      }
     },
     getDataC(type) {
       if (type == "search") {
@@ -373,21 +382,6 @@ export default {
       this.$refs.queryForm.resetFields();
       this.getDataC();
     },
-    // 详情
-    handleDetail1(row) {
-      this.$router.push({
-        name: "confirmDetail",
-        query: {
-          id: row.id,
-          detlCnt: row.detlCnt,
-          qtySum: row.qtySum,
-          purcAmt: row.purcAmt,
-          docmker: row.docmker,
-          docmkDate: row.docmkDate,
-          stas: row.stas,
-        },
-      });
-    },
   },
 };
 </script>

src/views/page/orderManage-sup/orthOpedicDelivery/index.vue

@@ -1,10 +1,10 @@
 <template>
-  <!-- 骨科采购订单出库 -->
-  <div style="display:flex">
-  <el-card style="width:18%;margin-right:18px;border-radius:6px;">
+  <!-- 采购订单待确认 -->
+  <div style="display: flex">
+    <el-card style="width: 18%; margin-right: 18px; border-radius: 6px">
       <el-tabs v-model="activeNametree" type="card" @tab-click="tabClick" stretch>
-          <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
-          <el-tab-pane label="按机构" name="org"></el-tab-pane>
+        <!-- <el-tab-pane label="按分类" name="grp"></el-tab-pane> -->
+        <el-tab-pane label="按机构" name="org"></el-tab-pane>
       </el-tabs>
       <el-tree
         :data="data"
@@ -12,234 +12,205 @@
         node-key="spdId"
         @node-click="handleNodeClick"
         default-expand-all="true"
-        style="margin-top:10px;"
-      >
-      <span class="custom-tree-node" slot-scope="{ node, data }">
-          <div>{{node.label}}</div>
-          <div class="redTit">{{data.wcknum}}</div> 
-        </span>
-      </el-tree>
+        style="margin-top: 10px"
+      ></el-tree>
     </el-card>
-  <div class="right-common-box">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="待出库" name="first">
-        <el-form :model="listQuery" ref="queryForm" :inline="true">
-          <el-form-item label="采购单号" prop="id">
-            <el-input v-model="listQuery.id" placeholder="请输入采购单号"></el-input>
-          </el-form-item>
-          <el-form-item label="医院名称" prop="branchName">
-            <el-input v-model="listQuery.branchName" placeholder="请输入医院名称"></el-input>
-          </el-form-item>
-          <el-form-item label="采购时间" prop="docmkDate">
-            <el-date-picker
-              v-model="listQuery.docmkDate"
-              type="daterange"
-              range-separator="至"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              style="width: 230px"
-            />
-          </el-form-item>
-          <!-- <el-form-item label="当前状态" prop="stas">
-                <el-select
-                    v-model="listQuery.stas"
-                    placeholder="请选择"
-                    clearable
-                >
-                    <el-option
-                        v-for="item in stasOptions"
-                        :key="item.value"
-                        :label="item.lable"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item> -->
-          <el-form-item>
-            <el-button type="primary" @click="getData('search')">查询 </el-button>
-            <el-button @click="reset">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table
-          v-loading="listLoading"
-          element-loading-text="加载中"
-          :data="list"
-          fit
-          stripe
-          border
-        >
-          <template slot="empty">
-            <img src="@/assets/nopage.png" alt />
-            <p>暂无数据</p>
-          </template>
-          <el-table-column fixed type="index" label="序号" width="60" />
-          <el-table-column label="订单编号" prop="id" />
-          <el-table-column label="订单种类" prop="detlCnt" />
-          <el-table-column label="订单总数量" prop="qtySum" />
-          <el-table-column label="剩余出库量" prop="delvCnt" />
-          <el-table-column label="订单总金额" prop="purcAmt" />
-          <el-table-column label="医院名称" prop="branchName" />
-          <el-table-column label="部门名称" prop="deptName" />
-          <el-table-column label="采购员" prop="docmker" />
-          <el-table-column label="采购时间" prop="docmkDate" width="140" />
-          <el-table-column label="状态" prop="stas">
-            <!-- <template #default="{ row }">
-              <span v-if="row.stas == 'A'">未受理</span>
-              <span v-if="row.stas == 'B'">未出库</span>
-              <span v-if="row.stas == 'R'">被驳回</span>
-              <span v-if="row.stas == 'C'">已出库</span>
-              <span v-if="row.stas == 'D'">部分出库</span>
-              <span v-if="row.stas == 'Y'">已入库</span>
-              <span v-if="row.stas == 'P'">部分入库</span>
-            </template> -->
-          </el-table-column>
-          <el-table-column label="操作" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
+    <div class="right-common-box">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="待出库" name="first">
+          <el-form :model="listQuery" ref="queryForm" :inline="true">
+            <el-form-item label="采购单号" prop="id">
+              <el-input v-model="listQuery.id" placeholder="请输入申领单号"></el-input>
+            </el-form-item>
+            <el-form-item label="客户名称" prop="deptName">
+              <el-input
+                v-model="listQuery.deptName"
+                placeholder="请输入客户名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="来源部门" prop="deptName">
+              <el-input
+                v-model="listQuery.deptName"
+                placeholder="请输入来源部门"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="采购时间" prop="docmkDate">
+              <el-date-picker
+                v-model="listQuery.docmkDate"
+                type="daterange"
+                range-separator="至"
+                :editable="false"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                style="width: 230px"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="getorderData('search')">查询 </el-button>
+              <el-button @click="reset">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table
+            v-loading="listLoading"
+            element-loading-text="加载中"
+            :data="list"
+            fit
+            height="500px"
+            stripe
+            border
+          >
+            <template slot="empty">
+              <img src="@/assets/nopage.png" alt />
+              <p>暂无数据</p>
             </template>
-          </el-table-column>
-        </el-table>
-        <!--分页-->
-        <yl-pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="listQuery.current"
-          :limit.sync="listQuery.size"
-          @pagination="getData"
-        />
-      </el-tab-pane>
-      <el-tab-pane label="已出库" name="second">
-        <el-form :model="listQueryC" ref="queryFormC" :inline="true">
-          <el-form-item label="出库单号" prop="delvOrdId">
-            <el-input
-              v-model="listQueryC.delvOrdId"
-              placeholder="请输入出库单号"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="关联采购单" prop="purcOrdId">
-            <el-input
-              v-model="listQueryC.purcOrdId"
-              placeholder="请输入关联采购单"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="医院名称" prop="branchName">
-            <el-input
-              v-model="listQueryC.branchName"
-              placeholder="请输入医院名称"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="出库时间" prop="docmkDate">
-            <el-date-picker
-              v-model="listQueryC.docmkDate"
-              type="daterange"
-              range-separator="至"
-              :editable="false"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-              style="width: 230px"
-            />
-          </el-form-item>
-          <!-- <el-form-item label="当前状态" prop="purcOrdStas">
-                <el-select
-                    v-model="listQuery.purcOrdStas"
-                    placeholder="请选择"
-                    clearable
-                >
-                    <el-option
-                        v-for="item in stasOptions"
-                        :key="item.value"
-                        :label="item.lable"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-            </el-form-item> -->
-          <el-form-item>
-            <el-button type="primary" @click="getDataC('search')">查询 </el-button>
-            <el-button @click="resetC">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table
-          v-loading="listLoading"
-          element-loading-text="加载中"
-          :data="listC"
-          fit
-          stripe
-          border
-        >
-          <template slot="empty">
-            <img src="@/assets/nopage.png" alt />
-            <p>暂无数据</p>
-          </template>
-          <el-table-column fixed type="index" label="序号" width="60" />
-          <el-table-column label="出库单号" prop="delvOrdId" />
-          <el-table-column label="关联采购单" prop="purcOrdId" />
-          <el-table-column label="采购品种数" prop="detlCnt" />
-          <el-table-column label="采购总数量" prop="qtySum" />
-          <el-table-column label="本次出库量" prop="bcckl" />
-          <el-table-column label="客户验收数量" prop="shppCnt" width="80" />
-          <el-table-column label="剩余出库量" prop="toDelvCnt" />
-          <el-table-column label="医院名称" prop="branchName" />
-          <el-table-column label="部门名称" prop="deptName" />
-          <el-table-column label="出库员" prop="docmker" />
-          <el-table-column label="出库时间" prop="docmkDate" width="140" />
-          <el-table-column label="状态" prop="delvOrdStas" width="100">
-            <template #default="{ row }">
-              <span v-if="row.delvOrdStas == 'A'">未受理</span>
-              <span v-if="row.delvOrdStas == 'B'">已受理</span>
-              <span v-if="row.delvOrdStas == 'R'">被驳回</span>
-              <span v-if="row.delvOrdStas == 'C'">已出库</span>
-              <span v-if="row.delvOrdStas == 'D'">部分出库</span>
-              <span v-if="row.delvOrdStas == 'Y'">结束订单</span>
-              <span v-if="row.delvOrdStas == 'P'">部分入库</span>
+            <el-table-column fixed type="index" label="序号" width="60" />
+            <el-table-column label="订单编号" prop="id" />
+            <el-table-column label="订单种类" prop="detlCnt" />
+            <el-table-column label="订单总数量" prop="qtySum" />
+            <el-table-column label="剩余出库量" prop="purcAmt" />
+            <el-table-column label="订单总金额" prop="deptName" />
+            <el-table-column label="客户名称" prop="docmker" />
+            <el-table-column label="来源部门" prop="docmker" />
+            <el-table-column label="采购时间" prop="docmkDate" />
+            <el-table-column label="当前状态" prop="stas">
+              <template #default="{ row }">
+                <span v-if="row.stas == 'A'">待出库</span>
+                <span v-if="row.stas == 'B'">部分已出库</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <yl-pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="listQuery.current"
+            :limit.sync="listQuery.size"
+            @pagination="getorderData"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="已出库" name="second">
+          <el-form :model="listQueryC" ref="queryForm" :inline="true">
+            <el-form-item label="出库单号" prop="id">
+              <el-input v-model="listQueryC.id" placeholder="请输入出库单号"></el-input>
+            </el-form-item>
+            <el-form-item label="关联采购单" prop="deptName">
+              <el-input
+                v-model="listQueryC.deptName"
+                placeholder="请输入关联采购单"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="客户名称" prop="deptName">
+              <el-input
+                v-model="listQueryC.deptName"
+                placeholder="请输入客户名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="来源部门" prop="deptName">
+              <el-input
+                v-model="listQueryC.deptName"
+                placeholder="请输入客户名称"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="采购时间" prop="docmkDate">
+              <el-date-picker
+                v-model="listQueryC.docmkDate"
+                type="daterange"
+                range-separator="至"
+                :editable="false"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                style="width: 230px"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="getData('search')">查询 </el-button>
+              <el-button @click="resetC">重置</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table
+            v-loading="listLoading"
+            element-loading-text="加载中"
+            :data="list"
+            fit
+            height="500px"
+            stripe
+            border
+          >
+            <template slot="empty">
+              <img src="@/assets/nopage.png" alt />
+              <p>暂无数据</p>
             </template>
-          </el-table-column>
-          <el-table-column label="操作" width="100">
-            <template slot-scope="scope">
-              <el-button type="text" @click="handleDetailC(scope.row)">详情</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--分页-->
-        <yl-pagination
-          v-show="totalC > 0"
-          :total="totalC"
-          :page.sync="listQueryC.current"
-          :limit.sync="listQueryC.size"
-          @pagination="getDataC"
-        />
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+            <el-table-column fixed type="index" label="序号" width="60" />
+            <el-table-column label="出库单号" prop="id" />
+            <el-table-column label="关联采购单" prop="detlCnt" />
+            <el-table-column label="采购品种数" prop="qtySum" />
+            <el-table-column label="本次出库量" prop="delvCnt" />
+
+
+            
+            <el-table-column label="订单总金额" prop="purcAmt" />
+            <el-table-column label="客户名称" prop="deptName" />
+            <el-table-column label="发起时间" prop="docmker" />
+            <el-table-column label="发起人" prop="docmkDate" />
+            <el-table-column label="状态" prop="stas">
+              <template #default="{ row }">
+                <span v-if="row.stas == 'A'">未受理</span>
+                <span v-if="row.stas == 'B'">已受理</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleDetail(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <!--分页-->
+          <yl-pagination
+            v-show="totalC > 0"
+            :total="totalC"
+            :page.sync="listQueryC.current"
+            :limit.sync="listQueryC.size"
+            @pagination="getDataC"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 
 <script>
 import ylPagination from "@/components/yl-pagination";
 import {
-  getMcsOrdDck,
-  getSplerMcsDelvOrdPage
-} from "@/api/orderManage-sup/index";
+  getMcsOrdPageSpler,
+  getALLOrgTree,
+  getMcsOrdPageYqrSpler,
+  selectSplerMcsList,
+  selectSpdList,
+} from "@/api/orderManage-sup/orthopedics";
 export default {
   components: {
     ylPagination,
   },
   data() {
     return {
-      activeNametree:"org",
-      data:[],
-      spdId:null,
+      activeNametree: "org",
+      activeName: "first",
       defaultProps: {
         children: "children",
         label: "spdName",
       },
-      activeName:"first",
       listQuery: {
         current: 1,
         size: 10,
         id: "",
-        branchName:"",
+        deptName: "",
         docmkDateStart: "",
         docmkDateEnd: "",
         docmkDate: [],
@@ -248,49 +219,95 @@ export default {
       listQueryC: {
         current: 1,
         size: 10,
-        purcOrdId:"",
-        branchName:"",
-        docmkDate:"",
-        delvOrdId:"",
-        docmkDateEnd:"",
-        branchName:"",
+        id: "",
+        deptName: "",
+        docmkDateStart: "",
+        docmkDateEnd: "",
+        docmkDate: [],
+        stas: "",
       },
       stasOptions: [
-        // {value: 'A', lable: "未受理"},
-        { value: "B", lable: "未出库" },
-        // {value: 'R', lable: "被驳回"},
+        { value: "A", lable: "未受理" },
+        { value: "B", lable: "已受理" },
+        { value: "R", lable: "被驳回" },
         { value: "C", lable: "已出库" },
         { value: "D", lable: "部分出库" },
-        // {value: 'Y', lable: "已入库"},
-        // {value: 'P', lable: "部分入库"}
+        { value: "Y", lable: "已入库" },
+        { value: "P", lable: "部分入库" },
       ],
+      options: [],
       listLoading: false,
       list: [],
-      listC:[],
       total: 0,
-      totalC:0,
+      totalC: 0,
     };
   },
   mounted() {
     this.getData();
   },
   methods: {
+    tabClick(tab) {
+      if (tab.label == "按机构") {
+        this.defaultProps.label = "spdName";
+      }
+      // else if(tab.label == "按分类"){
+      //     // this.getData4();
+      //     // this.defaultProps.label = 'orgGrpName'
+      //     // this.listQuery.type = 'grp';
+      // }
+    },
+    // 获取医院列表
+    getData(type) {
+      this.data = [];
+      this.listLoading = true;
+      selectSpdList()
+        .then((res) => {
+          this.listQuery.spdId = res.data[0].spdId;
+          this.data = res.data;
+          console.log(this.data, "dadad");
+          this.listLoading = false;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    },
+    // 点击获取医院药品列表
+    handleNodeClick(data) {
+      console.log(data, "data");
+      this.listLoading = true;
+      this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
+      this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
+      this.spdId = data.spdId;
+      this.listQuery.spdId = this.spdId;
+      getMcsOrdPageSpler(this.listQuery)
+        .then((res) => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+          console.log(res, "医院目录");
+          this.btnShow = true;
+        })
+        .catch((err) => {
+          this.listLoading = false;
+        });
+    },
     handleClick(tab) {
       console.log(tab.name, "name");
       if (tab.name == "first") {
-        this.getData();
+        this.getorderData();
       } else {
         this.getDataC();
       }
     },
-    getData(type) {
+
+    getorderData(type) {
       if (type == "search") {
         this.listQuery.current = 1;
       }
       this.listLoading = true;
       this.listQuery.docmkDateStart = this.listQuery.docmkDate[0];
       this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
-      getMcsOrdDck(this.listQuery)
+      getMcsOrdPageSpler(this.listQuery)
         .then((res) => {
           this.list = res.data.records;
           this.total = res.data.total;
@@ -299,86 +316,72 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
+      // getMcsOrdPageSpler().then(res =>{
+      // this.options = res.data
+      // })
     },
+
     reset() {
       this.$refs.queryForm.resetFields();
-      this.getData();
+      this.getorderData();
     },
     // 详情
     handleDetail(row) {
-      this.$router.push({
-        name: "deliveryDetail",
-        query: {
-          deptName:row.deptName,
-          deptId:row.deptId,
-          id: row.id,
-          detlCnt: row.detlCnt,
-          qtySum:row.qtySum,
-          purcAmt:row.purcAmt,
-          docmker: row.docmker,
-          docmkDate: row.docmkDate,
-          stas: row.stas,
-          branchName:row.branchName
-        },
-      });
+      if (row.stas == "1") {
+        console.log(wqwqw, "we");
+        this.$router.push({
+          path: "acceptDetail",
+          query: {
+            id: row.id,
+            detlCnt: row.detlCnt,
+            qtySum: row.qtySum,
+            purcAmt: row.purcAmt,
+            docmker: row.docmker,
+            docmkDate: row.docmkDate,
+            stas: row.stas,
+          },
+        });
+      } else if (row.stas == "2") {
+        this.$router.push({
+          name: "confirmDetail",
+          query: {
+            id: row.id,
+            detlCnt: row.detlCnt,
+            qtySum: row.qtySum,
+            purcAmt: row.purcAmt,
+            docmker: row.docmker,
+            docmkDate: row.docmkDate,
+            stas: row.stas,
+          },
+        });
+      }
     },
     getDataC(type) {
       if (type == "search") {
         this.listQueryC.current = 1;
       }
       this.listLoading = true;
-      this.listQueryC.docmkDateStart = this.listQueryC.docmkDate[0];
-      this.listQueryC.docmkDateEnd = this.listQueryC.docmkDate[1];
-      getSplerMcsDelvOrdPage(this.listQueryC)
+      this.listQueryC.docmkDateStart = this.listQuery.docmkDate[0];
+      this.listQueryC.docmkDateEnd = this.listQuery.docmkDate[1];
+      getMcsOrdPageYqrSpler(this.listQuery)
         .then((res) => {
-          this.listC = res.data.records;
-          this.totalC = res.data.total;
+          this.list = res.data.records;
+          this.total = res.data.total;
           this.listLoading = false;
         })
         .catch((err) => {
           this.listLoading = false;
         });
+      // getMcsOrdPageYqrSpler().then(res =>{
+      // this.options = res.data
+      // })
     },
     resetC() {
-      this.$refs.queryFormC.resetFields();
+      this.$refs.queryForm.resetFields();
       this.getDataC();
     },
-    // 详情
-    handleDetailC(row) {
-      console.log(row);
-      this.$router.push({
-        name: "alreadyDetail",
-        query: {
-          delvOrdId: row.delvOrdId,
-          purcOrdId: row.purcOrdId,
-          detlCnt: row.detlCnt,
-          docmker: row.docmker,
-          deptName:row.deptName,
-          docmkDate: row.docmkDate,
-          delvOrdStas: row.delvOrdStas,
-          branchName:row.branchName,
-          qtySum:row.qtySum,
-        },
-      });
-    },
   },
 };
 </script>
 
-<style lang="scss" scoped>
-.custom-tree-node{
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-.custom-tree-node ::v-deep .redTit{
-  min-width: 30px;
-  background-color: #f56c6c;
-  min-height: 1px;
-  border-radius: 10px;
-  text-align: center;
-  margin-left: 10px;
-  padding: 1px;
-  color: #fff;
-}
-</style>
+<style lang="scss" scoped></style>

src/views/page/orderManage-sup/purOrderAccept/acceptDetail.vue

@@ -49,23 +49,39 @@
               </div>
             </el-form-item>
           </div>
-          <div class="flex-css">
-            <el-form-item label="当前状态" prop="stas">
+          <div class="flex-css">  
+            <el-form-item label="采购时间" prop="docmkDate">
+              <div class="content">
+                {{ listForm.docmkDate }}
+              </div>
+            </el-form-item> 
+            <el-form-item label="手术名称" prop="stas" v-show="false">
               <div class="content">
                 {{ listForm.stas }}
               </div>
             </el-form-item>
-            <el-form-item label="采购时间" prop="docmkDate">
+            <el-form-item label="手术间" prop="stas" v-show="false">
               <div class="content">
-                {{ listForm.docmkDate }}
+                {{ listForm.stas }}
               </div>
-            </el-form-item> 
-            <el-form-item label=" " prop="">
+            </el-form-item>
+          </div>
+          <div class="flex-css">    
+            <el-form-item label="主治医生" prop="stas" v-show="false">
               <div class="content">
-                <!-- {{ listForm.docmker }} -->
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+            <el-form-item label="手术日期" prop="stas" v-show="false">
+              <div class="content">
+                {{ listForm.stas }}
+              </div>
+            </el-form-item>
+            <el-form-item label="当前状态" prop="stas">
+              <div class="content">
+                {{ listForm.stas }}
               </div>
             </el-form-item>
-            
           </div>
         </div>
       </el-form>

src/views/page/orderManage-sup/purOrderAccept/index.vue

@@ -76,8 +76,13 @@
             <el-table-column label="采购总金额" prop="purcAmt" />
             <el-table-column label="客户名称" prop="branchName" />
             <el-table-column label="来源部门" prop="deptName" />
-            <!-- <el-table-column label="采购员" prop="docmker" /> -->
             <el-table-column label="采购时间" prop="docmkDate" width="140" />
+            <el-table-column label="采购类型" prop="" width="100">
+              <template #default="{ row }">
+                <span v-if="row.stas == 'A'">手术备货</span>
+                <span v-if="row.stas == 'B'">普通采购</span>
+              </template>
+            </el-table-column>
             <el-table-column label="当前状态" prop="stas">
               <template #default="{ row }">
                 <span v-if="row.stas == 'A'">未受理</span>

src/views/page/orderManage-sup/purOrderDelivery/deliveryDetail.vue

@@ -223,11 +223,11 @@
                   </el-form-item>
               </template>
           </el-table-column>
-          <!-- <el-table-column label="UDI码" prop="udid" >
+          <el-table-column label="UDI码" prop="udid" >
             <template slot-scope="scope">
                 <el-button type="text" @click="handleudi(scope.row)">{{scope.row.delvCnt}}</el-button>
               </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column label="报关单" prop="invoFileId" width="200">
             <template slot-scope="scope">
               <yl-upload

src/views/page/orderManage-sup/purOrderDelivery/index.vue

@@ -445,6 +445,7 @@ export default {
           qtySum:row.qtySum,
           spdId:this.spdId,
           activeName:this.activeName,
+          purcAmt:row.purcAmt
         },
       });
     },

src/views/page/procurement-settlement/invoiceManage/consumptionDetail.vue

@@ -436,6 +436,10 @@ export default {
                 })
                 .catch(() => {
                   this.submitLoad = false;
+                  this.$message({
+                    message: "提交失败",
+                    type: "error",
+                  });
                 });
             })
             .catch(() => {});

src/views/page/procurement-settlement/reconciliation/supplierDetail.vue

@@ -295,6 +295,7 @@ export default {
           .then((res) => {
             if (res.success == true) {
               this.sureLoading = false;
+              this.$message.success("操作成功");
               this.$router.push({
                 name: "reconciliation",
                 query: { spdId: this.$route.query.spdId,activeNameTab:this.$route.query.activeNameTab },

src/views/page/productreturnmanage-sup/returnOrderAccept/returnDetail.vue

@@ -238,6 +238,7 @@ export default {
           .then((res) => {
             if (res.success == true) {
               this.sureLoading = false;
+              this.$message.success("操作成功");
               this.$router.push({
                 name: "returnOrderAccept",
                 query: { spdId: this.$route.query.spdId },