问题修复

src/views/components/printTable.vue

@@ -4,11 +4,7 @@
       <table class="printTable" border="1" style="table-layout: auto">
         <thead>
           <tr>
-            <td colspan="14">供应商：{{ userName }}</td>
-          </tr>
-          <tr>
-            <td colspan="1">医院名称</td>
-            <td colspan="11">{{ tableLabel }}</td>
+            <td colspan="14">{{ userName }}</td>
           </tr>
         </thead>
         <thead>
@@ -46,12 +42,19 @@
           </tr>
         </tbody>
       </table>
+      <div class="fot-val">
+        {{ tableLabel }}
+        <br />
+        <br />
+        &nbsp; &nbsp; &nbsp; &nbsp;{{ time }}
+      </div>
       <div style="page-break-after: always"></div>
     </div>
   </div>
 </template>
 <script>
 import { numberToChineseAmount } from "@/utils/utils";
+import moment from "moment";
 export default {
   components: {},
   data() {
@@ -59,7 +62,8 @@ export default {
       tableLabel: "",
       taData: [],
       userName: "",
-      numBeroMount: ""
+      numBeroMount: "",
+      time: ""
     };
   },
   props: {
@@ -93,12 +97,17 @@ export default {
     }
   },
   mounted() {
+    let stopTime = moment(new Date())
+      .subtract(2, "months")
+      .startOf("month")
+      .format("YYYY-MM");
+    this.time = stopTime;
     this.userName =
-      this.$store.state.user.username +
+      this.$route.query.branchName +
       "----" +
       this.$route.query.stmtPrd +
-      "对账明细";
-    this.tableLabel = this.$route.query.branchName;
+      "结算单";
+    this.tableLabel = this.$store.state.user.username;
     let newData = this.paginData(this.tableData, 5);
     this.taData = newData;
   }
@@ -134,4 +143,12 @@ export default {
     margin-right: 45mm; /* 取消默认的左右页边距 */
   }
 }
+.fot-val {
+  width: 100%;
+  height: 100px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 50px;
+}
 </style>

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

@@ -685,6 +685,8 @@ export default {
         { value: "1", name: "高值耗材" },
         { value: "2", name: "试剂" },
         { value: "3", name: "总务耗材" },
+        { value: "4", name: "低值可收费" },
+        { value: "5", name: "低值不可收费" },
       ],
       prodTypeData: [
         { value: "0", name: "医用耗材" },

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

@@ -488,7 +488,9 @@ export default {
         { value: "0", name: "普通耗材" },
         { value: "1", name: "高值耗材" },
         { value: "2", name: "试剂" },
-        { value: "3", name: "总务耗材" }
+        { value: "3", name: "总务耗材" },
+        { value: "4", name: "低值可收费" },
+        { value: "5", name: "低值不可收费" }
       ],
       prodTypeData: [
         { value: "0", name: "医用耗材" },

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

@@ -665,7 +665,9 @@ export default {
         { value: "0", name: "普通耗材" },
         { value: "1", name: "高值耗材" },
         { value: "2", name: "试剂" },
-        { value: "3", name: "总务耗材" }
+        { value: "3", name: "总务耗材" },
+        { value: "4", name: "低值可收费" },
+        { value: "5", name: "低值不可收费" }
       ],
       SoucData: [{ value: "1", name: "国产" }, { value: "2", name: "进口" }],
       statusData: [

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

@@ -608,7 +608,9 @@ export default {
         { value: "0", name: "普通耗材" },
         { value: "1", name: "高值耗材" },
         { value: "2", name: "试剂" },
-        { value: "3", name: "总务耗材" }
+        { value: "3", name: "总务耗材" },
+        { value: "4", name: "低值可收费" },
+        { value: "5", name: "低值不可收费" }
       ],
       SoucData: [{ value: "1", name: "国产" }, { value: "2", name: "进口" }],
       statusData: [

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

@@ -0,0 +1,337 @@
+<template>
+  <div style="display: flex; position: relative">
+    <el-card style="width: 18%; margin-right: 18px; border-radius: 6px">
+      <el-tree
+        :data="dataTree"
+        :props="defaultProps"
+        node-key="hospId"
+        :current-node-key="currentNodeKey"
+        ref="tree1"
+        highlight-current="true"
+        @node-click="handleNodeClick"
+        default-expand-all="true"
+        style="margin-top: 10px"
+        v-loading="dataTreeloading"
+      >
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <div>{{ node.label }}</div>
+          <div class="redTit">{{ data.wslnum }}</div>
+        </span>
+      </el-tree>
+    </el-card>
+    <div class="common-box" style="width: 82%">
+      <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="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="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" 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"
+        height="500"
+        fit
+        stripe
+        border
+      >
+        <template slot="empty">
+          <img src="@/assets/nopage.png" alt />
+          <p>暂无数据</p>
+        </template>
+        <el-table-column type="index" label="序号" width="60" />
+        <el-table-column label="采购单号" prop="id" />
+        <el-table-column label="计划类型" prop="planType" />
+        <el-table-column label="品规数" prop="detlCnt" />
+        <el-table-column label="金额" prop="purcAmt" />
+        <el-table-column label="采购方" prop="orgName" />
+        <!-- <el-table-column label="制单人" prop="docmker" /> -->
+        <el-table-column label="制单时间" prop="docmkDate" />
+        <el-table-column label="当前状态" prop="stas">
+          <template #default="{ row }">
+            <el-tag v-if="row.stas == 'A'" type="info">未受理</el-tag>
+            <el-tag v-if="row.stas == 'B'" type="success">已受理</el-tag>
+            <el-tag v-if="row.stas == 'R'" type="danger">被驳回</el-tag>
+            <el-tag v-if="row.stas == 'C'" type="success">已出库</el-tag>
+            <el-tag v-if="row.stas == 'D'">部分出库</el-tag>
+            <el-tag v-if="row.stas == 'Y'" type="success">已入库</el-tag>
+            <el-tag v-if="row.stas == 'P'">部分入库</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="部门名称"
+          prop="deptName"
+          v-if="hospIdWrong == '3'"
+        />
+        <el-table-column
+          label="采购方上级"
+          prop="prntOrgName"
+          v-if="hospIdWrong == '4'"
+        />
+        <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="getData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import ylPagination from "@/components/yl-pagination";
+// import { deleteEmptyGroup } from "@/utils/utils";
+// import {
+//   getOrdPageSpler,
+//   getALLOrgTree,
+//   QueryHospList,
+// } from "@/api/orderManage-sup/index";
+export default {
+  components: {
+    ylPagination
+  },
+  data() {
+    return {
+      listQuery: {
+        current: 1,
+        size: 5,
+        id: "",
+        hospId: "",
+        docmkDateStart: "",
+        docmkDateEnd: "",
+        docmkDate: [],
+        stas: "A",
+        orgId: ""
+      },
+      stasOptions: [
+        { value: "A", lable: "未受理" },
+        // { value: "B", lable: "已受理" },
+        { value: "R", lable: "被驳回" }
+        // { value: "C", lable: "已出库" },
+        // { value: "D", lable: "部分出库" },
+        // { value: "Y", lable: "已入库" },
+        // { value: "P", lable: "部分入库" }
+      ],
+      options: [],
+      listLoading: false,
+      list: [],
+      total: 0,
+      dataTree: "",
+      activeName: "org",
+      hospId: null,
+      currentNodeKey: "",
+      defaultProps: {
+        children: "children",
+        label: "hospName"
+      },
+      // itemsPerPage:5
+      hospIdWrong: null, //用于判断只有万荣要的部门名称
+      dataTreeloading: false
+    };
+  },
+  created() {
+    if (this.$route.params.hospId) {
+      this.listQuery.current = this.$route.params.current;
+      this.handleNodeClick(this.$route.params.hospId);
+    }
+    if (localStorage.sizeaccept) {
+      this.listQuery.size = Number(localStorage.sizeaccept);
+    }
+  },
+  mounted() {
+    this.dataTreeloading = true;
+    QueryHospList()
+      .then(res => {
+        this.listQuery.hospId = res.data[0].hospId;
+        this.dataTree = res.data;
+        this.dataTreeloading = false;
+        this.$nextTick(() => {
+          this.$refs.tree1.setCurrentKey(this.currentNodeKey);
+        });
+      })
+      .catch(() => {
+        this.dataTreeloading = false;
+      });
+  },
+  methods: {
+    tabClick(tab) {
+      if (tab.label == "按机构") {
+        QueryHospList().then(res => {
+          console.log(res, "shu");
+          this.dataTree = res.data;
+        });
+        this.defaultProps.label = "hospName";
+      } else if (tab.label == "按分类") {
+        this.dataTree = [];
+        // this.defaultProps.label = 'orgGrpName'
+        // this.listQuery.type = 'grp';
+      }
+    },
+    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];
+      // this.listQuery.hospId = this.hospId;
+
+      getOrdPageSpler(this.listQuery)
+        .then(res => {
+          if (res.success == true) {
+            this.list = res.data.records;
+            this.total = res.data.total;
+            this.listLoading = false;
+            localStorage.setItem(
+              "sizeaccept",
+              JSON.stringify(this.listQuery.size)
+            );
+          }
+        })
+        .catch(err => {
+          this.listLoading = false;
+        });
+    },
+    // 点击获取医院药品列表
+    handleNodeClick(data) {
+      this.hospIdWrong = data.hospId;
+      this.listQuery.spdId = data.spdId;
+      this.listLoading = true;
+      if (data.hospId) {
+        this.listQuery.hospId = data.hospId;
+        this.hospId = data.hospId;
+        this.currentNodeKey = data.hospId;
+        // this.$store.commit("user/SET_HOSPID", data.hospId);
+      } else {
+        this.listQuery.hospId = data;
+        this.currentNodeKey = data;
+        // this.$store.commit("user/SET_HOSPID", data);
+      }
+      getOrdPageSpler(this.listQuery)
+        .then(res => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+        })
+        .catch(err => {
+          this.listLoading = false;
+        });
+      getALLOrgTree().then(res => {
+        this.options = res.data;
+        deleteEmptyGroup(this.options);
+      });
+    },
+    reset() {
+      this.$refs.queryForm.resetFields();
+      this.getData();
+    },
+    // 详情
+    handleDetail(row) {
+      this.$router.push({
+        name: "acceptDetail",
+        query: {
+          id: row.id,
+          detlCnt: row.detlCnt,
+          orgName: row.orgName,
+          docmker: row.docmker,
+          docmkDate: row.docmkDate,
+          stas: row.stas,
+          docmkerConinfo: row.docmkerConinfo,
+          hospId: this.currentNodeKey,
+          current: this.listQuery.current,
+          ifCustomer: row.ifCustomer,
+          spdId: this.listQuery.spdId,
+          prntOrgName: row.prntOrgName
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card__body {
+  padding: 6px;
+}
+::v-deep .el-tabs__nav {
+  width: 99%;
+}
+::v-deep .el-tabs__item {
+  width: 49.5%;
+}
+::v-deep .el-badge__content.is-fixed {
+  top: 8px;
+  right: 22px;
+}
+.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/editbag.vue

@@ -390,7 +390,9 @@ export default {
         { value: "0", label: "普通耗材" },
         { value: "1", label: "高值耗材" },
         { value: "2", label: "试剂" },
-        { value: "3", label: "总务耗材" }
+        { value: "3", label: "总务耗材" },
+        { value: "4", name: "低值可收费" },
+        { value: "5", name: "低值不可收费" }
       ],
       prodSoucOptions: [
         { value: "1", label: "国产" },

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

@@ -382,7 +382,9 @@ export default {
         { value: "0", label: "普通耗材" },
         { value: "1", label: "高值耗材" },
         { value: "2", label: "试剂" },
-        { value: "3", label: "总务耗材" }
+        { value: "3", label: "总务耗材" },
+        { value: "4", name: "低值可收费" },
+        { value: "5", name: "低值不可收费" }
       ],
       prodSoucOptions: [
         { value: "1", label: "国产" },

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

@@ -147,7 +147,7 @@ import {
 import {
   selectSetlStmtDetlD,
   updateSetlStmtDStas,
-  exportAllSetlExcel
+  exportAllSetlExcel,
 } from "@/api/procurement-settlement/index";
 import { exportData } from "../../consumCataManage-sup/const.js";
 export default {
@@ -160,7 +160,7 @@ export default {
   data() {
     return {
       tableHeader: [
-      {
+        {
           label: "序号",
           value: "serial",
         },
@@ -189,7 +189,7 @@ export default {
           value: "pric",
         },
         {
-          label: "总计",
+          label: "总计（元）",
           value: "amt",
         },
         {
@@ -316,15 +316,19 @@ export default {
     this.getData();
   },
   methods: {
-     //导出
-     exportExal() {
-      exportAllSetlExcel({ stmtNo: this.$route.query.stmtNo }).then((res) => {
+    //导出
+    exportExal() {
+      exportAllSetlExcel({
+        stmtNo: this.$route.query.stmtNo,
+        spdName: this.$route.query.branchName,
+        stmtPrd: this.$route.query.stmtPrd,
+      }).then((res) => {
         const _res = res.data;
-        exportData(_res,'对账明细');
-      })
+        exportData(_res, "对账明细");
+      });
     },
     printDataView() {
-      this.comModal =  true;
+      this.comModal = true;
     },
     comhandleClose() {
       this.comModal = false;
@@ -446,15 +450,15 @@ export default {
     margin-right: 20px;
   }
 }
-.right-btn{
-    width: 100%;
-    height:50px;
-    padding-right:20px;
-    position: absolute;
-    left:0;
-    top:0;
-    display: flex;
-    align-items: center;
-    justify-content:flex-end;
+.right-btn {
+  width: 100%;
+  height: 50px;
+  padding-right: 20px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
 }
 </style>