udi天假

src/api/consumCataManage-sup/index.js

@@ -4,8 +4,8 @@ import request from "@/utils/request";
 // 查机构
 export function selectSpdList(data) {
     return request({
-        url:"/web/mcsList/selectSpdList",
-        method:"post",
+        url: "/web/mcsList/selectSpdList",
+        method: "post",
         data
     })
 }
@@ -13,40 +13,40 @@ export function selectSpdList(data) {
 // 查询配送目录接口汇总
 export function selectSplerMcsList(data) {
     return request({
-        url:"/web/mcsList/selectSplerMcsList",
-        method:"post",
+        url: "/web/mcsList/selectSplerMcsList",
+        method: "post",
         data
     })
 }
 // 查询招采耗材接口(弹窗分页)
 export function selectMcsList(data) {
     return request({
-        url:"/web/mcsList/selectMcsList",
-        method:"post",
+        url: "/web/mcsList/selectMcsList",
+        method: "post",
         data
     })
 }
 // 新增耗材配送目录(弹窗确认)
 export function saveSplerMcs(data) {
     return request({
-        url:"/web/mcsList/saveSplerMcs",
-        method:"post",
+        url: "/web/mcsList/saveSplerMcs",
+        method: "post",
         data
     })
 }
 // 耗材目录详情
 export function selectMcsListById(data) {
     return request({
-        url:"/web/mcsList/selectMcsListById",
-        method:"post",
+        url: "/web/mcsList/selectMcsListById",
+        method: "post",
         data
     })
 }
 // 耗材详情修改 
 export function insertSplerMcsList(data) {
     return request({
-        url:"/web/mcsList/insertSplerMcsList",
-        method:"post",
+        url: "/web/mcsList/insertSplerMcsList",
+        method: "post",
         data
     })
 }
@@ -54,40 +54,40 @@ export function insertSplerMcsList(data) {
 // 查询目录记录接口(汇 selectSplerMcsListIntf
 export function selectSplerMcsListIntf(data) {
     return request({
-        url:"/web/mcsList/selectSplerMcsListIntf",
-        method:"post",
+        url: "/web/mcsList/selectSplerMcsListIntf",
+        method: "post",
         data
     })
 }
 // // 查询目录记录接口详情接口
 export function selectMcsListIntfById(data) {
     return request({
-        url:"/web/mcsList/selectMcsListIntfById",
-        method:"post",
+        url: "/web/mcsList/selectMcsListIntfById",
+        method: "post",
         data
     })
 }
 // 新增耗材资质接口
 export function insertMcsQua(data) {
     return request({
-        url:"/web/mcsList/insertMcsQua",
-        method:"post",
+        url: "/web/mcsList/insertMcsQua",
+        method: "post",
         data
     })
 }
 // 新增生产企业资质接口
 export function insertFacQua(data) {
     return request({
-        url:"/web/mcsList/insertFacQua",
-        method:"post",
+        url: "/web/mcsList/insertFacQua",
+        method: "post",
         data
     })
 }
 //目录删除
 export function deleteSplerMcs(data) {
     return request({
-        url:"/web/mcsList/deleteSplerMcs",
-        method:"post",
+        url: "/web/mcsList/deleteSplerMcs",
+        method: "post",
         data
     })
 }
@@ -108,8 +108,8 @@ export function deleteSplerMcs(data) {
 // 配送商申请调价变更
 export function PricChg(data) {
     return request({
-        url:"/web/drugList/PricChg",
-        method:"post",
+        url: "/web/drugList/PricChg",
+        method: "post",
         data
     })
 }
@@ -124,8 +124,8 @@ export function PricChg(data) {
 // 医院列表查询(调价)
 export function getALLOrgTree(data) {
     return request({
-        url:"/web/org/getALLOrgTree",
-        method:"post",
+        url: "/web/org/getALLOrgTree",
+        method: "post",
         data
     })
 }
@@ -133,8 +133,8 @@ export function getALLOrgTree(data) {
 // 获取医院药品目录(调价)
 export function QueryHospDrugListTJ(data) {
     return request({
-        url:"/web/drugList/QueryHospDrugListTJ",
-        method:"post",
+        url: "/web/drugList/QueryHospDrugListTJ",
+        method: "post",
         data
     })
 }
@@ -143,48 +143,48 @@ export function QueryHospDrugListTJ(data) {
 // 获取医院列表(对码)
 export function QueryHospList(data) {
     return request({
-        url:"/web/drugList/QueryHospList",
-        method:"post",
+        url: "/web/drugList/QueryHospList",
+        method: "post",
         data
     })
 }
 // 获取医院药品目录(对码)
 export function QueryHospDrugList(data) {
     return request({
-        url:"/web/drugList/QueryHospDrugList",
-        method:"post",
+        url: "/web/drugList/QueryHospDrugList",
+        method: "post",
         data
     })
 }
 // 获取供应商药品目录
 export function QuerySplerDrugList(data) {
     return request({
-        url:"/web/drugList/QuerySplerDrugList",
-        method:"post",
+        url: "/web/drugList/QuerySplerDrugList",
+        method: "post",
         data
     })
 }
 // 对码
 export function DrugMatch(data) {
     return request({
-        url:"/web/drugList/DrugMatch",
-        method:"post",
+        url: "/web/drugList/DrugMatch",
+        method: "post",
         data
     })
 }
 // 取消对码
 export function CancMatch(data) {
     return request({
-        url:"/web/drugList/CancMatch",
-        method:"post",
+        url: "/web/drugList/CancMatch",
+        method: "post",
         data
     })
 }
 //下载模版
 export function exportMcsTemplate(data) {
     return request({
-        url:"/web/mcsList/exportMcsTemplate",
-        method:"post",
+        url: "/web/mcsList/exportMcsTemplate",
+        method: "post",
         data,
         responseType: "blob",
     })
@@ -192,9 +192,17 @@ export function exportMcsTemplate(data) {
 //目录导入
 export function importMcsExcel(data) {
     return request({
-        url:"/web/mcsList/importMcsExcel",
-        method:"post",
+        url: "/web/mcsList/importMcsExcel",
+        method: "post",
         data,
-        headers: { 'Content-Type': 'application/octet-stream'}
+        headers: { 'Content-Type': 'application/octet-stream' }
+    })
+}
+//服务费记录查询
+export function selectMcsListFwf(data) {
+    return request({
+        url: "/web/mcsList/selectMcsListFwf",
+        method: "post",
+        data
     })
 }

src/utils/menu/systemMenu.js

@@ -489,6 +489,18 @@ const systemMenuObj = [
     router: "distributionmanage",
     hidden: 0
   },
+  {
+    component: "/page/consumCataManage-sup/serviceRecord",
+    icon: "",
+    id: "serviceRecord",
+    menuType: "MENU",
+    name: "serviceRecord",
+    parentId: "consumCataManage-sup",
+    redirect: "",
+    remark: "服务费记录",
+    router: "serviceRecord",
+    hidden: 0
+  },
   //目录库存查询
   {
     component: "/page/catalog-inventory/index",

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

@@ -0,0 +1,193 @@
+<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"
+      ></el-tree>
+    </el-card>
+    <div class="right-common-box">
+      <el-table
+        v-loading="listLoading"
+        element-loading-text="加载中"
+        :data="list"
+        fit
+        height="500"
+        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="hiCode" />
+        <el-table-column prop="payType" label="服务费收取">
+          <template #default="{ row }">
+            <span v-if="row.payType == '1'">是</span>
+            <span v-if="row.payType == '2'">否</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="驳回原因" prop="rejtRea" />
+        <el-table-column
+          label="当前状态"
+          prop="status"
+          width="80"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <span v-if="row.stas == 'A'">已提交</span>
+            <span v-if="row.stas == 'B'">待审核</span>
+            <span v-if="row.stas == 'C'">审核通过</span>
+            <span v-if="row.stas == 'R'">驳回 </span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页-->
+      <yl-pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="listQuery.current"
+        :limit.sync="listQuery.size"
+        @pagination="getHospConsum"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import ylPagination from "@/components/yl-pagination";
+import mcsInfo from "@/views/components/mcs-info.vue";
+import {
+  selectMcsListFwf,
+  selectSpdList
+} from "@/api/consumCataManage-sup/index";
+import rulesR from "@/utils/rules";
+import ylUpload from "@/components/yl-upload";
+export default {
+  components: {
+    ylPagination,
+    ylUpload,
+    mcsInfo
+  },
+  data() {
+    return {
+      activeName: "grp",
+      rulesR,
+      spdId: null,
+      data: [],
+      defaultProps: {
+        children: "children",
+        label: "spdName"
+      },
+      listQuery: {
+        current: 1,
+        size: 10,
+        spdId: ""
+      },
+      listLoading: false,
+      list: [],
+      total: 0
+    };
+  },
+  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;
+          this.listLoading = false;
+        })
+        .catch(err => {
+          this.listLoading = false;
+        });
+    },
+    // 点击获取医院药品列表
+    handleNodeClick(data) {
+      this.listLoading = true;
+      this.spdId = data.spdId;
+      this.listQuery.spdId = this.spdId;
+      this.getTableData(this.listQuery);
+    },
+    getTableData(data) {
+      selectMcsListFwf(data)
+        .then(res => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+          this.btnShow = true;
+        })
+        .catch(err => {
+          this.listLoading = false;
+        });
+    },
+    // 搜索获取医院药品列表
+    getHospConsum(type) {
+      if (type == "search") {
+        this.listQuery.current = 1;
+      }
+      this.listLoading = true;
+      selectMcsListFwf(this.listQuery)
+        .then(res => {
+          this.list = res.data.records;
+          this.total = res.data.total;
+          this.listLoading = false;
+        })
+        .catch(err => {
+          this.listLoading = false;
+        });
+    }
+  },
+  mounted() {
+    this.getData();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-card__body {
+  padding: 12px;
+}
+::v-deep .el-tree-node__content {
+  height: 35px;
+}
+::v-deep .el-input__suffix {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 15px;
+}
+::v-deep .long .el-form-item__content {
+  width: 220px;
+}
+::v-deep .long .el-input__inner {
+  width: 199px;
+}
+</style>

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

@@ -234,6 +234,7 @@ export default {
       activeName: "first",
       data: [],
       spdId: null,
+      tabName: "first",
       defaultProps: {
         children: "children",
         label: "spdName"
@@ -329,6 +330,7 @@ export default {
       } else {
         this.getorderDataC();
       }
+      this.activeName = tab.name;
     },
     // 获取医院列表
     getData(type) {
@@ -369,16 +371,11 @@ export default {
       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, "医院目录");
-        })
-        .catch(err => {
-          this.listLoading = false;
-        });
+      if (this.activeName == "first") {
+        this.getorderData();
+      } else {
+        this.getorderDataC();
+      }
     },
     reset() {
       this.$refs.queryForm.resetFields();
@@ -465,6 +462,7 @@ export default {
 ::v-deep .long .el-input__inner {
   width: 199px;
 }
+
 .right-common-box ::v-deep .el-table__fixed {
   height: 100% !important;
 }
@@ -472,11 +470,13 @@ export default {
 .right-common-box ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
+
 .custom-tree-node {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
 }
+
 .custom-tree-node ::v-deep .redTit {
   min-width: 30px;
   background-color: #f56c6c;

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

@@ -200,7 +200,7 @@
           <el-table-column label="需求数量" prop="purcCnt" />
           <el-table-column label="已出库数量" prop="delvCntYck" width="90px" />
           <el-table-column label="剩余出库量" prop="toDelvCnt" width="90px" />
-          <el-table-column label="生产日期" prop="manuDate" width="220"  v-if="!cShow">
+          <el-table-column label="生产日期" prop="manuDate" width="220">
             <template slot-scope="scope">
               <el-form-item
                 label-width="0"
@@ -220,7 +220,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="有效期至" width="220" prop="prodExpy"  v-if="!cShow">
+          <el-table-column label="有效期至" width="220" prop="prodExpy">
             <template slot-scope="scope">
               <el-form-item
                 label-width="0"
@@ -264,7 +264,7 @@
                    <span>{{ rejAmtNub(scope.row) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="UDI码" prop="udi" v-if="cShow">
+          <el-table-column label="UDI码" prop="udi">
           <!-- <el-table-column label="UDI码" prop="udi"> -->
             <template slot-scope="scope">
                 <el-button type="text" @click="handleudi(scope.row,scope.$index)">{{scope.row.delvCnt}}</el-button>

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

@@ -507,6 +507,7 @@ export default {
     },
     // tab栏
     handleClick(tab) {
+      this.activeName = tab.name;
       if (tab.name == "first") {
         this.getOutboundData();
       }
@@ -525,6 +526,7 @@ export default {
           this.listQuery.spdId = res.data[0].spdId;
           this.listQueryC.spdId = res.data[0].spdId;
           this.data = res.data;
+          this.spdId = res.data[0].spdId;
           this.getTableList(this.listQuery);
         })
         .catch(err => {});
@@ -555,7 +557,15 @@ export default {
       this.listQuery.docmkDateEnd = this.listQuery.docmkDate[1];
       this.spdId = data.spdId;
       this.listQuery.spdId = this.spdId;
-      this.getTableList(this.listQuery);
+      if (this.activeName == "first") {
+        this.getOutboundData();
+      }
+      if (this.activeName == "second") {
+        this.getOutboundDataC();
+      }
+      if (this.activeName == "reject") {
+        this.getRejectTableData();
+      }
     },
     getTableList(listQuery) {
       getMcsOrdDck(listQuery)
@@ -719,6 +729,7 @@ export default {
   flex-direction: row;
   justify-content: space-between;
 }
+
 .custom-tree-node ::v-deep .redTit {
   min-width: 30px;
   background-color: #f56c6c;

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

@@ -1285,29 +1285,28 @@ export default {
           spdId: this.$route.query.spdId,
           deptName: this.$route.query.deptName,
         };
-        console.log(data2, '驳回后提交的数据');
-        // retnDelvOrdCommit(data2)
-        //   .then((res) => {
-        //     this.printVisible = false;
-        //     this.$message.success("出库成功");
-        //     this.$router.push({
-        //       name: "devsuccs",
-        //       query: {
-        //         form: JSON.stringify({
-        //           ...this.listForm,
-        //           delvOrdId: res.data.id,
-        //           docmker: res.data.docmker,
-        //           docmkDate: res.data.docmkDate,
-        //           quit: "outbound",
-        //         }),
-        //         data: JSON.stringify(this.multipleSelection),
-        //       },
-        //     });
-        //   })
-        //   .catch((err) => {
-        //     // this.$message.error("出库失败")
-        //     // this.confirmLoadLoad = false;
-        //   });
+        retnDelvOrdCommit(data2)
+          .then((res) => {
+            this.printVisible = false;
+            this.$message.success("出库成功");
+            this.$router.push({
+              name: "devsuccs",
+              query: {
+                form: JSON.stringify({
+                  ...this.listForm,
+                  delvOrdId: res.data.id,
+                  docmker: res.data.docmker,
+                  docmkDate: res.data.docmkDate,
+                  quit: "outbound",
+                }),
+                data: JSON.stringify(this.multipleSelection),
+              },
+            });
+          })
+          .catch((err) => {
+            // this.$message.error("出库失败")
+            // this.confirmLoadLoad = false;
+          });
       });
     },
     // 保存

vue.config.js

@@ -45,7 +45,7 @@ module.exports = {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.246:8602`,
+        target: `http://127.0.0.1:8603`,
         // target: `http://192.168.0.56:8502`,
         // target: `http://192.168.0.248:6000`,
         //target: `http://api.szlcloud.com/admin`,