耗材目录管理

src/router/index.js

@@ -13,6 +13,9 @@ import storeroomRouter from "./modules/storeroom"; //库房管理
 import approveRouter from "./modules/approve"; //审批中心
 import supplierRouter from "./modules/supplier"; //供应商管理
 import orderRouter from "./modules/order"; //订单管理
+import returnRouter from "./modules/productreturn"; //订单管理
+import consumRouter from "./modules/consumcata"; //目录管理
+// returnRouter
 
 export const constantRoutes = [
   {
@@ -80,6 +83,8 @@ export const asyncRoutes = [
   approveRouter,
   supplierRouter,
   orderRouter,
+  returnRouter,
+  consumRouter,
   { path: "*", redirect: "/404", hidden: true }
 ];
 

src/router/modules/consumcata.js

@@ -0,0 +1,24 @@
+/** When your routing table is too long, you can split it into small modules**/
+
+import Layout from "@/layout";
+
+const consumRouter = {
+  path: "/consumCataManage-sup",
+  component: Layout,
+  name: "consumCataManage-sup1",
+  meta: { title: "耗材目录管理", icon: "" },
+  alwaysShow: true,
+  hidden: true,
+  children: [    
+    {
+        // 采购订单-已出库详情
+        path: "catalogdetails",
+        component: () => import("@/views/page/consumCataManage-sup/catalogdetails.vue"),
+        name: "catalogdetails",
+        meta: { title: "耗材目录详情", icon: "" },
+        hidden: true
+      },
+  ]
+};
+
+export default consumRouter;

src/router/modules/order.js

@@ -41,32 +41,8 @@ const orderRouter = {
       name: "alreadyDetail",
       meta: { title: "采购订单-已出库详情", icon: "" },
       hidden: true
-    },
-    {
-      // 采购订单-已出库详情
-      path: "catalogdetails",
-      component: () => import("@/views/page/consumCataManage-sup/catalogdetails.vue"),
-      name: "catalogdetails",
-      meta: { title: "耗材目录详情", icon: "" },
-      hidden: true
-    },
-    
-    {
-      // 退货订单受理-待确认详情
-      path: "returnDetail",
-      component: () => import("@/views/page/productreturnmanage-sup/returnOrderAccept/returnDetail.vue"),
-      name: "returnDetail",
-      meta: { title: "退货待确认详情", icon: "" },
-      hidden: true
-    },
-    {
-      // 退货订单受理-已确认详情
-      path: "returncomDetail",
-      component: () => import("@/views/page/productreturnmanage-sup/returnOrderAccept/returncomDetail.vue"),
-      name: "returncomDetail",
-      meta: { title: "退货已确认详情", icon: "" },
-      hidden: true
-    },
+    },  
+
   ]
 };
 

src/router/modules/productreturn.js

@@ -0,0 +1,32 @@
+/** When your routing table is too long, you can split it into small modules**/
+
+import Layout from "@/layout";
+
+const returnRouter = {
+  path: "/productreturnmanage-sup",
+  component: Layout,
+  name: "productreturnmanage-sup1",
+  meta: { title: "商品退货管理", icon: "" },
+  alwaysShow: true,
+  hidden: true,
+  children: [    
+    {
+      // 退货订单受理-待确认详情
+      path: "returnDetail",
+      component: () => import("@/views/page/productreturnmanage-sup/returnOrderAccept/returnDetail.vue"),
+      name: "returnDetail",
+      meta: { title: "退货待确认详情", icon: "" },
+      hidden: true
+    },
+    {
+      // 退货订单受理-已确认详情
+      path: "returncomDetail",
+      component: () => import("@/views/page/productreturnmanage-sup/returnOrderAccept/returncomDetail.vue"),
+      name: "returncomDetail",
+      meta: { title: "退货已确认详情", icon: "" },
+      hidden: true
+    },
+  ]
+};
+
+export default returnRouter;

src/utils/menu/systemMenu.js

@@ -584,7 +584,7 @@ const systemMenuObj = [
     name: "productreturnmanage-sup",
     parentId: "0",
     redirect: "/productreturnmanage-sup",
-    remark: "订单管理",
+    remark: "商品退货管理",
     router: "/productreturnmanage-sup",
     hidden: 0
   },

src/utils/rules.js

@@ -37,6 +37,18 @@ export function checkInterNum(rule, value, callback) {
   }
 }
 
+// 汉字 
+export function checkChinese(rule, value, callback) {
+  const reg = /^[\u4e00-\u9fa5]+$/;
+  if (!value) {
+    return callback(new Error("请填写汉字"));
+  } else if (!reg.test(value)) {
+    return callback(new Error("请输入汉字"));
+  } else {
+    callback();
+  }
+}
+
 // 自然数
 export function checkNatureNum(rule, value, callback) {
   const reg = /^\d+$/;
@@ -97,6 +109,7 @@ export default {
   numPot2: [{ required: true, validator: checkNumPot2, trigger: "blur" }],
   numPot4: [{ required: true, validator: checkNumPot4, trigger: "blur" }],
   InterNum: [{ required: true, validator: checkInterNum, trigger: "blur" }],
+  InterChina: [{ required: true, validator: checkChinese, trigger: "blur" }],
   natureNum: [{ required: true, validator: checkNatureNum, trigger: "blur" }],
   phoneNum: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
   email: [{ required: true, validator: checkEmail, trigger: "blur" }],

src/views/login/index.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="center-box">
       <div class="big-title">
-        <h1>云流供应商协同平台</h1>
+        <h1>云流供应商端耗材管理系统</h1>
         <p>云流（北京）科技有限公司山西分公司</p>
       </div>
       <div class="banner-container">

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

@@ -14,7 +14,7 @@
       <h3>审批状态</h3>
       <yl-step></yl-step>
     </div>
-    <el-form :model="infoData" ref="planForm" label-width="180px" class="grid-form-class">
+    <el-form :model="infoData" ref="planForm" label-width="150px" class="grid-form-class">
       <div class="common-card">
         <h3>商品基本资料</h3>
         <!-- <div class="right-type" style="color: #3c64dc; font-weight: 800">
@@ -22,76 +22,104 @@
         </div> -->
         <div class="form-body">
           <div class="flex-css">
-            <el-form-item label="耗材名称" prop="materialName" :rules="rules.required">
+            <el-form-item label="耗材名称" prop="prodName">
               <el-input
-                v-model="infoData.materialName"
+                readonly
+                v-model="infoData.prodName"
                 placeholder="请输入耗材名称"
               ></el-input>
             </el-form-item>
-            <el-form-item label="助记码" prop="zjm" :rules="rules.required">
-              <el-input
-                v-model="infoData.zjm"
-                placeholder="请输入助记码"
-              ></el-input>
-            </el-form-item>
             <el-form-item label="通用名称" prop="genName" :rules="rules.required">
               <el-input
                 v-model="infoData.genName"
                 placeholder="请输入通用名称"
               ></el-input>
             </el-form-item>
-          </div>
-          <div class="flex-css">
-            <el-form-item label="英文名称" prop="engName" :rules="rules.required">
+            <el-form-item label="英文名称" prop="engName">
               <el-input
                 v-model="infoData.engName"
                 placeholder="请输入英文名称"
               ></el-input>
             </el-form-item>
-            <el-form-item label="品牌" prop="brand" :rules="rules.required">
-              <el-input
-                v-model="infoData.brand"
-                placeholder="请输入品牌"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="生产企业" prop="prodentpName" :rules="rules.required">
-              <el-input
-                v-model="infoData.prodentpName"
-                placeholder="请输入生产企业"
-              ></el-input>
-            </el-form-item>
           </div>
           <div class="flex-css">
-            <el-form-item label="生产来源" prop="source" :rules="rules.selectRequired">
-              <el-select v-model="infoData.source" placeholder="请选择生产来源" clearable>
+            <el-form-item label="品牌" prop="brad">
+              <el-input v-model="infoData.brad" placeholder="请输入品牌"></el-input>
+            </el-form-item>
+            <el-form-item label="生产来源" prop="prodSouc" :rules="rules.selectRequired">
+              <el-select
+                v-model="infoData.prodSouc"
+                placeholder="请选择生产来源"
+                clearable
+              >
                 <el-option
                   v-for="item in sourceData"
                   :key="item.value"
                   :label="item.name"
-                  :value="item.name"
+                  :value="item.value"
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="规格" prop="spec" :rules="rules.required">
-              <el-input v-model="infoData.spec" placeholder="请输入规格"></el-input>
+            <el-form-item label="生产企业" prop="prodEntp">
+              <el-input
+                readonly
+                v-model="infoData.prodEntp"
+                placeholder="请输入生产企业"
+              ></el-input>
+            </el-form-item>
+          </div>
+          <div class="flex-css">
+            <el-form-item label="代理企业" prop="agnt">
+              <el-input
+                readonly
+                v-model="infoData.agnt"
+                placeholder="请输入代理企业"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="型号" prop="model" :rules="rules.required">
-              <el-input v-model="infoData.model" placeholder="请输入型号"></el-input>
+            <el-form-item label="挂网价格" prop="pubonlnPric">
+              <el-input
+                readonly
+                v-model="infoData.pubonlnPric"
+                placeholder="请输入挂网价格"
+              ></el-input>
+            </el-form-item>
+
+            <el-form-item label="规格" prop="spec" >
+              <el-input
+                v-model="infoData.spec"
+                readonly
+                placeholder="请输入规格"
+              ></el-input>
             </el-form-item>
           </div>
           <div class="flex-css">
-            <el-form-item label="材质" prop="matl" :rules="rules.required">
-              <el-input v-model="infoData.matl" placeholder="请输入材质"></el-input>
+            <el-form-item label="型号" prop="mol">
+              <el-input
+                v-model="infoData.mol"
+                readonly
+                placeholder="请输入型号"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="材质" prop="matl">
+              <el-input
+                v-model="infoData.matl"
+                readonly
+                placeholder="请输入材质"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="包装材质" prop="pacMatl" :rules="rules.required">
+            <el-form-item label="包装材质" prop="pacmatl">
               <el-input
-                v-model="infoData.pacMatl"
+                readonly
+                v-model="infoData.pacmatl"
                 placeholder="请输入包装材质"
               ></el-input>
             </el-form-item>
-            <el-form-item label="注册证号" prop="approve" :rules="rules.required">
+          </div>
+          <div class="flex-css">
+            <el-form-item label="注册证号" prop="regcertno">
               <el-input
-                v-model="infoData.approve"
+                readonly
+                v-model="infoData.regcertno"
                 placeholder="请输入注册证号"
               ></el-input>
             </el-form-item>
@@ -102,20 +130,37 @@
         <h3>商品属性资料</h3>
         <div class="form-body">
           <div class="flex-css">
-            <el-form-item label="商品大类" prop="prodClassCate" :rules="rules.required">
-              <el-input
-                v-model="infoData.prodClassCate"
-                placeholder="请输入商品大类"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="商品类别" prop="prodTypeB" :rules="rules.required">
-              <el-input
-                v-model="infoData.prodTypeB"
-                placeholder="请输入商品类别"
-              ></el-input>
+            <!-- <el-form-item label="商品大类" prop="prodType" :rules="rules.required">
+              <el-select v-model="infoData.prodType" placeholder="请选择商品大类" clearable>
+                <el-option
+                  v-for="item in prodTypeData"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="耗材类别" prop="mcsType" :rules="rules.selectRequired">
+              <el-select
+                v-model="infoData.mcsType"
+                placeholder="请选择耗材类别"
+                clearable
+              >
+                <el-option
+                  v-for="item in mcsTypeData"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
-            <el-form-item label="是否集采" prop="ifJc" :rules="rules.selectRequired">
-              <el-select v-model="infoData.ifJc" placeholder="请选择是否集采" clearable>
+            <el-form-item label="是否集采" prop="isFas" >
+              <el-select
+                v-model="infoData.isFas"
+                placeholder="请选择是否集采"
+                clearable
+                disabled
+              >
                 <el-option
                   v-for="item in iFjcData"
                   :key="item.value"
@@ -124,31 +169,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            
           </div>
           <div class="flex-css">
-            <el-form-item label="集采批次" prop="batch" :rules="rules.required">
+            <el-form-item label="集采批次" prop="fasBtch">
               <el-input
-                v-model="infoData.batch"
+                readonly
+                v-model="infoData.fasBtch"
                 placeholder="请输入集采批次"
               ></el-input>
             </el-form-item>
-            <el-form-item label="采购单位" prop="defPurcUnit" :rules="rules.required">
-              <el-input
-                v-model="infoData.defPurcUnit"
-                placeholder="请输入采购单位"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="采购价" prop="pric" :rules="rules.numPot2">
-              <el-input
-                v-model="infoData.pric"
-                placeholder="请输入采购价"
-              ></el-input>
-            </el-form-item>
-          </div>
-          <div  class="flex-css">
-            <el-form-item label="是否寄售" prop="ifJs" :rules="rules.selectRequired">
-              <el-select v-model="infoData.ifJs" placeholder="请选择是否寄售" clearable>
+            <el-form-item label="是否寄售" prop="isCgmt" :rules="rules.selectRequired">
+              <el-select v-model="infoData.isCgmt" placeholder="请选择是否寄售" clearable>
                 <el-option
                   v-for="item in iFjcData"
                   :key="item.value"
@@ -157,8 +188,8 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="是否十八项重点耗材" prop="ifZd" :rules="rules.selectRequired">
-              <el-select v-model="infoData.ifZd" placeholder="请选择是否十八项重点耗材" clearable>
+            <!-- <el-form-item label="是否十八项重点耗材" prop="isEm" :rules="rules.selectRequired">
+              <el-select v-model="infoData.isEm" placeholder="请选择是否十八项重点耗材" clearable>
                 <el-option
                   v-for="item in iFjcData"
                   :key="item.value"
@@ -166,7 +197,7 @@
                   :value="item.value"
                 ></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </div>
         </div>
       </div>
@@ -174,25 +205,56 @@
         <h3>耗材编码资料</h3>
         <div class="form-body">
           <div class="flex-css">
-            <el-form-item label="医保编码" prop="ybbm" :rules="rules.required">
+            <el-form-item label="医保编码" prop="hiCode">
               <el-input
-                v-model="infoData.ybbm"
+                readonly
+                v-model="infoData.hiCode"
                 placeholder="请输入医保编码"
               ></el-input>
             </el-form-item>
-            <!-- <el-form-item label="耗材编码" prop="duty" :rules="rules.required">
+          </div>
+        </div>
+      </div>
+      <div class="common-card">
+        <h3>商品包装资料</h3>
+        <div class="form-body">
+          <div class="flex-css">
+            <el-form-item label="最小单位" prop="purcUnt" :rules="rules.InterChina">
               <el-input
-                v-if="infoData.stas == 'A' || infoData.stas == 'R'"
-                v-model="infoData.duty"
-                placeholder="请输入耗材编码"
+                v-model="infoData.purcUnt"
+                placeholder="请输入最小单位"
               ></el-input>
-              <div class="content" v-else>
-                {{ infoData.duty }}
-              </div>
-            </el-form-item> -->
+            </el-form-item>
+            <el-form-item label="采购价" prop="purcPric" :rules="rules.numPot2">
+              <el-input v-model="infoData.purcPric" placeholder="请输入采购价"></el-input>
+            </el-form-item>
+          </div>
+          <div class="flex-css">
+            <el-form-item label="采购单位" prop="prcUnt" :rules="rules.InterChina">
+              <el-input v-model="infoData.prcUnt" placeholder="请输入采购单位"></el-input>
+            </el-form-item>
+            <el-form-item label="包装内数量" prop="convrat" :rules="rules.InterNum">
+              <template slot-scope="{}" slot="label">
+                <span>包装内数量</span>
+                <el-tooltip class="item" effect="dark" placement="top">
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 14px; vertical-align: middle"
+                  ></i>
+                  <div slot="content">包含最小单位的数量</div>
+                </el-tooltip>
+              </template>
+              <template>
+                <el-input
+                  v-model="infoData.convrat"
+                  placeholder="请输入包装内数量"
+                ></el-input>
+              </template>
+            </el-form-item>
           </div>
         </div>
       </div>
+
       <!-- <div class="common-card">
         <h3>商品包装资料</h3>
         <div class="form-body">
@@ -330,20 +392,20 @@
         <h3>其他资料</h3>
         <div class="form-body">
           <div class="flex-css">
-            <el-form-item label="存储方式" prop="stoRe" :rules="rules.required">
+            <el-form-item label="存储方式" prop="stogType" :rules="rules.required">
               <el-input
-                v-model="infoData.stoRe"
+                v-model="infoData.stogType"
                 placeholder="请输入存储方式"
               ></el-input>
             </el-form-item>
-            <el-form-item label="存储温度" prop="stoTem" :rules="rules.required">
+            <el-form-item label="存储温度" prop="stogTemp" :rules="rules.required">
               <el-input
-                v-model="infoData.stoTem"
+                v-model="infoData.stogTemp"
                 placeholder="请输入存储温度"
               ></el-input>
             </el-form-item>
-            <el-form-item label="是否灭菌" prop="ifMj" :rules="rules.selectRequired">
-              <el-select v-model="infoData.ifMj" placeholder="请选择是否灭菌" clearable>
+            <el-form-item label="是否灭菌" prop="isStlz" :rules="rules.selectRequired">
+              <el-select v-model="infoData.isStlz" placeholder="请选择是否灭菌" clearable>
                 <el-option
                   v-for="item in iFjcData"
                   :key="item.value"
@@ -356,7 +418,7 @@
         </div>
       </div>
     </el-form>
-    <div class="foot-button" >
+    <div class="foot-button" v-if="btnShow">
       <el-button type="success" @click="handleSave" :loading="saveLoad">保存</el-button>
       <el-button type="primary" @click="handleSubmit" :loading="submitLoad"
         >提交</el-button
@@ -380,17 +442,34 @@ export default {
       infoData: { quaList: [] },
       listLoading: false,
       planForm: {},
-      sourceData:[
-        { value: "0", name: "非进口" },
-        { value: "1", name: "进口" },
+      sourceData: [
+        { value: "1", name: "国产" },
+        { value: "2", name: "进口" },
+      ],
+      iFjcData: [
+        { value: "0", name: "是" },
+        { value: "1", name: "否" },
+      ],
+      mcsTypeData: [
+        { value: "0", name: "普通耗材" },
+        { value: "1", name: "高值耗材" },
+        { value: "2", name: "试剂" },
       ],
-      iFjcData:[
-        { value: "0", name: "否" },
-        { value: "1", name: "是" },
-      ]
+      prodTypeData: [
+        { value: "0", name: "医用耗材" },
+        { value: "1", name: "办公用品" },
+      ],
+      btnShow: true,
     };
   },
   created() {
+    // this.$nextTick(()=>{
+    //   this.$refs['planForm'].resetFields();
+    // })
+    if (this.$route.query.status == "B") {
+      this.btnShow = false;
+    }
+    
     this.getData();
   },
   methods: {
@@ -404,12 +483,13 @@ export default {
     },
     //获取列表数据
     getData() {
-      selectMcsListById({id:this.$route.query.id})
+      selectMcsListById({ id: this.$route.query.id })
         .then((response) => {
           this.infoData = response.data;
+          this.$refs['planForm'].resetFields();
         })
         .catch((err) => {
-          this.$message.error("获取数据失败")
+          this.$message.error("获取数据失败");
         });
     },
     // 新增
@@ -484,29 +564,29 @@ export default {
     // 信息保存
     handleSave() {
       // this.$refs["planForm"].validate((valid) => {
-        // if (valid) {
-          this.$confirm("确认保存", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
-            .then(() => {
-              this.saveLoad = true;
-              this.infoData.status ="A"
-              insertSplerMcsList(this.infoData)
-                .then((response) => {
-                  this.$message({
-                    message: "保存成功",
-                    type: "success",
-                  });
-                  this.saveLoad = false;
-                })
-                .catch(() => {
-                  this.saveLoad = false;
-                });
+      // if (valid) {
+      this.$confirm("确认保存", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.saveLoad = true;
+          this.infoData.status = "A";
+          insertSplerMcsList(this.infoData)
+            .then((response) => {
+              this.$message({
+                message: "保存成功",
+                type: "success",
+              });
+              this.saveLoad = false;
             })
-            .catch(() => {});
-        // }
+            .catch(() => {
+              this.saveLoad = false;
+            });
+        })
+        .catch(() => {});
+      // }
       // });
     },
 
@@ -521,7 +601,7 @@ export default {
           })
             .then(() => {
               this.submitLoad = true;
-              this.infoData.status ="B"
+              this.infoData.status = "B";
               insertSplerMcsList(this.infoData)
                 .then((response) => {
                   this.$message({
@@ -529,6 +609,9 @@ export default {
                     type: "success",
                   });
                   this.submitLoad = false;
+                  this.$router.push({
+                    name: "consumCataManagement-sup",
+                  });
                 })
                 .catch(() => {
                   this.submitLoad = false;
@@ -543,7 +626,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .el-input__inner {
-  width: 199px;
-}
+// ::v-deep .el-input__inner {
+// width: 300px;
+// }
 </style>

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

@@ -1,19 +1,6 @@
 <template>
   <!-- 配送目录管理 -->
   <div style="display: flex">
-    <!--  <el-card style="width:18%;margin-right:18px;border-radius:6px;">
-     <el-tabs v-model="activeName" 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="hospId"
-        @node-click="handleNodeClick"
-        style="margin-top:10px;"
-      ></el-tree> 
-    </el-card>-->
     <div class="right-common-box">
       <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="100px">
         <el-form-item label="耗材编码" prop="materialId" class="long">
@@ -22,28 +9,28 @@
             placeholder="请输入耗材编码"
           ></el-input>
         </el-form-item>
-        <el-form-item label="医保编码" prop="ybbm" class="long">
-          <el-input v-model="listQuery.ybbm" placeholder="请输入医保编码"></el-input>
+        <el-form-item label="医保编码" prop="hiCode" class="long">
+          <el-input v-model="listQuery.hiCode" placeholder="请输入医保编码"></el-input>
         </el-form-item>
-        <el-form-item label="耗材名称" prop="materialName" class="long">
+        <el-form-item label="耗材名称" prop="prodName" class="long">
           <el-input
-            v-model="listQuery.materialName"
+            v-model="listQuery.prodName"
             placeholder="请输入耗材名称"
           ></el-input>
         </el-form-item>
-        <el-form-item label="是否集采" prop="ifJc" class="long">
-          <el-select v-model="listQuery.ifJc" placeholder="请选择是否集采" clearable>
+        <el-form-item label="是否集采" prop="isFas" class="long">
+          <el-select v-model="listQuery.isFas" placeholder="请选择是否集采" clearable>
             <el-option
               v-for="item in isFasData"
               :key="item.value"
               :label="item.name"
-              :value="item.name"
+              :value="item.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="集采批次" prop="batch" class="long">
-          <el-input v-model="listQuery.batch" placeholder="请输入集采批次"></el-input>
-          <!-- <el-select v-model="listQuery.batch" placeholder="请选择集采批次" clearable>
+        <el-form-item label="集采批次" prop="fasBtch" class="long">
+          <el-input v-model="listQuery.fasBtch" placeholder="请输入集采批次"></el-input>
+          <!-- <el-select v-model="listQuery.fasBtch" placeholder="请选择集采批次" clearable>
             <el-option
               v-for="item in isFasData"
               :key="item.value"
@@ -52,10 +39,10 @@
             ></el-option>
           </el-select> -->
         </el-form-item>
-        <el-form-item label="商品类别" prop="prodType" class="long">
-          <el-select v-model="listQuery.prodType" placeholder="请选择商品类别" clearable>
+        <el-form-item label="商品类别" prop="mcsType" class="long">
+          <el-select v-model="listQuery.mcsType" placeholder="请选择商品类别" clearable>
             <el-option
-              v-for="item in isFasData"
+              v-for="item in mcsTypeData"
               :key="item.value"
               :label="item.name"
               :value="item.value"
@@ -66,36 +53,28 @@
         <el-form-item label="规格" prop="spec" class="long">
           <el-input v-model="listQuery.spec" placeholder="请输入规格"></el-input>
         </el-form-item>
-        <el-form-item label="型号" prop="model" class="long">
-          <el-input v-model="listQuery.model" placeholder="请输入型号"></el-input>
+        <el-form-item label="型号" prop="mol" class="long">
+          <el-input v-model="listQuery.mol" placeholder="请输入型号"></el-input>
         </el-form-item>
         <el-form-item label="材质" prop="matl" class="long">
           <el-input v-model="listQuery.matl" placeholder="请输入材质"></el-input>
         </el-form-item>
 
-        <el-form-item label="生产来源" prop="source" class="long">
-          <el-select v-model="listQuery.source" placeholder="请选择生产来源" clearable>
+        <el-form-item label="生产来源" prop="prodSouc" class="long">
+          <el-select v-model="listQuery.prodSouc" placeholder="请选择生产来源" clearable>
             <el-option
-              v-for="item in isFasData"
+              v-for="item in SoucData"
               :key="item.value"
               :label="item.name"
               :value="item.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="生产企业" prop="prodentpName" class="long">
-          <el-select
-            v-model="listQuery.prodentpName"
-            placeholder="请选择生产企业"
-            clearable
-          >
-            <el-option
-              v-for="item in isFasData"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"
-            ></el-option>
-          </el-select>
+        <el-form-item label="生产企业" prop="prodEntp" class="long">
+              <el-input
+                v-model="listQuery.prodEntp"
+                placeholder="请输入生产企业"
+              ></el-input>
         </el-form-item>
         <el-form-item label="当前状态" prop="status" class="long">
           <el-select v-model="listQuery.status" placeholder="请选择当前状态" clearable>
@@ -145,19 +124,35 @@
         </template>
         <el-table-column fixed type="index" label="序号" width="60" />
         <el-table-column label="耗材编码" prop="materialId" width="80" />
-        <el-table-column label="医保编码" prop="ybbm" width="80" />
-        <el-table-column label="耗材名称" prop="materialName" width="80" />
-        <el-table-column label="是否集采" prop="ifJc" width="80" />
-        <el-table-column label="集采批次" prop="batch" width="80" />
-        <el-table-column label="商品类别" prop="prodType" width="80" />
+        <el-table-column label="医保编码" prop="hiCode" width="80" />
+        <el-table-column label="耗材名称" prop="prodName" width="80" />
+        <el-table-column label="是否集采" prop="isFas" width="80">
+          <template #default="{ row }">
+              <span v-if="row.isFas == '1'">否</span>
+              <span v-if="row.isFas == '0'">是</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="集采批次" prop="fasBtch" width="80" />
+        <el-table-column label="商品类别" prop="mcsType" width="80">
+          <template #default="{ row }">
+              <span v-if="row.mcsType == '0'">普通耗材</span>
+              <span v-if="row.mcsType == '1'">高值耗材</span>
+              <span v-if="row.mcsType == '2'">试剂</span>
+            </template>
+        </el-table-column>
         <el-table-column label="规格" prop="spec" width="80" />
-        <el-table-column label="型号" prop="model" width="80" />
+        <el-table-column label="型号" prop="mol" width="80" />
         <el-table-column label="材质" prop="matl" width="80" />
-        <el-table-column label="生产来源" prop="source" width="80" />
-        <el-table-column label="注册证号" prop="approve" width="80" />
-        <el-table-column label="生产企业" prop="prodentpName" width="80" />
-        <el-table-column label="采购价" prop="pric" width="80" />
-        <el-table-column label="当前状态" prop="status" width="80">
+        <el-table-column label="生产来源" prop="prodSouc" width="80">
+          <template #default="{ row }">
+              <span v-if="row.prodSouc == '1'">国产</span>
+              <span v-if="row.prodSouc == '2'">进口</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="注册证号" prop="regcertno" width="80" />
+        <el-table-column label="生产企业" prop="prodEntp" width="80" />
+        <el-table-column label="采购价" prop="purcPric" width="80" />
+        <el-table-column label="当前状态" prop="status" width="80" fixed="right">
           <template #default="{ row }">
               <span v-if="row.status == 'A'">待审核</span>
               <span v-if="row.status == 'B'">审核中</span>
@@ -221,8 +216,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="生产企业" prop="prodentpName">
-              <el-input v-model.trim="temp.prodentpName" readonly placeholder="请输入" />
+            <el-form-item label="生产企业" prop="prodEntp">
+              <el-input v-model.trim="temp.prodEntp" readonly placeholder="请输入" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -263,31 +258,31 @@
     <el-dialog title="选择耗材" :visible.sync="dialogAdd" width="75%">
       <template>
         <el-form :model="listQueryadd" ref="listQueryadd" :inline="true">
-          <el-form-item label="耗材名称" prop="materialName" class="long">
+          <el-form-item label="耗材名称" prop="prodName" class="long">
             <el-input
-              v-model="listQueryadd.materialName"
+              v-model="listQueryadd.prodName"
               placeholder="请输入耗材名称"
             ></el-input>
           </el-form-item>
-          <el-form-item label="耗材规格" prop="spec" class="long">
+          <el-form-item label="规格" prop="spec" class="long">
             <el-input v-model="listQueryadd.spec" placeholder="请输入耗材规格"></el-input>
           </el-form-item>
-          <el-form-item label="耗材编码" prop="materialId" class="long">
+          <!-- <el-form-item label="耗材编码" prop="materialId" class="long">
             <el-input
               v-model="listQueryadd.materialId"
               placeholder="请输入耗材编码"
             ></el-input>
+          </el-form-item> -->
+          <el-form-item label="医保编码" prop="hiCode" class="long">
+            <el-input v-model="listQueryadd.hiCode" placeholder="请输入医保编码"></el-input>
           </el-form-item>
-          <el-form-item label="医保编码" prop="ybbm" class="long">
-            <el-input v-model="listQueryadd.ybbm" placeholder="请输入医保编码"></el-input>
-          </el-form-item>
-          <el-form-item label="是否集采" prop="ifJc" class="long">
-            <el-select v-model="listQueryadd.ifJc" placeholder="请选择是否集采" clearable>
+          <el-form-item label="是否集采" prop="isFas" class="long">
+            <el-select v-model="listQueryadd.isFas" placeholder="请选择是否集采" clearable>
               <el-option
                 v-for="item in isFasData"
                 :key="item.value"
                 :label="item.name"
-                :value="item.name"
+                :value="item.value"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -331,22 +326,36 @@
             :reserve-selection="true"
             width="55"
           ></el-table-column>
-          <el-table-column prop="ybbm" label="医保编码" width="150"> </el-table-column>
-          <el-table-column prop="materialName" label="耗材名称" width="180">
+          <el-table-column prop="hiCode" label="医保编码" width="150"> </el-table-column>
+          <el-table-column prop="prodName" label="耗材名称" width="180">
+          </el-table-column>
+          <el-table-column prop="pubonlnPric" label="挂网价格" width="180">
+          </el-table-column>
+          <el-table-column prop="isFas" label="是否集采" width="120"> 
+            <template #default="{ row }">
+              <span v-if="row.isFas == '1'">否</span>
+              <span v-if="row.isFas == '0'">是</span>
+            </template>
           </el-table-column>
-          <el-table-column prop="ifJc" label="是否集采" width="120"> </el-table-column>
-          <el-table-column prop="batch" label="集采批次"> </el-table-column>
-          <el-table-column prop="prodType" label="商品类别" width="120">
+          <el-table-column prop="fasBtch" label="集采批次"> </el-table-column>
+          <el-table-column prop="splb" label="商品类别" width="120">
           </el-table-column>
-          <el-table-column prop="prodType" label="商品分类" width="120">
+          <el-table-column prop="spfl" label="商品分类" width="120">
           </el-table-column>
           <el-table-column prop="spec" label="规格"> </el-table-column>
-          <el-table-column prop="model" label="型号"> </el-table-column>
+          <el-table-column prop="mol" label="型号"> </el-table-column>
           <el-table-column prop="matl" label="材质"> </el-table-column>
-          <el-table-column prop="pacMatl" label="包装材质"> </el-table-column>
-          <el-table-column prop="source" label="生产来源"> </el-table-column>
-          <el-table-column prop="approve" label="注册证号"> </el-table-column>
-          <el-table-column prop="prodentpName" label="生产企业" width="120">
+          <el-table-column prop="pacmatl" label="包装材质"> </el-table-column>
+          <el-table-column prop="prodSouc" label="生产来源"> 
+            <template #default="{ row }">
+              <span v-if="row.prodSouc == '1'">国产</span>
+              <span v-if="row.prodSouc == '0'">进口</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="regcertno" label="注册证号"> </el-table-column>
+          <el-table-column prop="prodEntp" label="生产企业" width="120">
+          </el-table-column>
+          <el-table-column prop="agnt" label="代理企业" width="180">
           </el-table-column>
         </el-table>
         <div slot="footer" class="dialog-footer">
@@ -455,33 +464,17 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        materialName: "",
-        materialId: "",
-        spec: "",
-        ybbm: "",
-        ifJc: "",
-        batch: "",
-        model: "",
-        source: "",
-        prodType: "",
-        matl: "",
-        prodentpName: "",
-        status: "",
-      },
-      supQuery: {
-        current: 1,
-        size: 10,
-        materialName: "",
         materialId: "",
         spec: "",
-        ybbm: "",
-        ifJc: "",
-        batch: "",
-        model: "",
-        source: "",
-        prodType: "",
+        hiCode: "",
+        isFas: "",
+        fasBtch: "",
+        mol: "",
+        prodSouc: "",
+        mcsType: "",
         matl: "",
-        prodentpName: "",
+        prodEntp: "",
+        prodName:"",
         status: "",
       },
       listLoading: false,
@@ -495,8 +488,17 @@ export default {
         { value: "1", name: "已对码" },
       ],
       isFasData: [
-        { value: "0", name: "否" },
-        { value: "1", name: "是" },
+        { value: "0", name: "是" },
+        { value: "1", name: "否" },
+      ],
+      mcsTypeData:[
+        { value: "0", name: "普通耗材" },
+        { value: "1", name: "高值耗材" },
+        { value: "2", name: "试剂" },
+      ],
+      SoucData: [
+        { value: "1", name: "国产" },
+        { value: "0", name: "进口" },
       ],
       statusData:[
         {value:"A",name:"待审核"},
@@ -512,7 +514,7 @@ export default {
         dosformName: "",
         specName: "",
         pacUnt: "",
-        prodentpName: "",
+        prodEntp: "",
         pricInit: "",
         pricCurr: "",
         appyRea: "",
@@ -589,13 +591,13 @@ export default {
       listdialogLoading: false,
       dialogAdd: false,
       listQueryadd: {
-        materialName: "",
+        materialId: "",
         materialId: "",
         spec: "",
-        ybbm: "",
-        ifJc: "",
-        batch: "",
-        model: "",
+        hiCode: "",
+        isFas: "",
+        fasBtch: "",
+        mol: "",
         current: 1,
         size: 10,
       },
@@ -666,7 +668,7 @@ export default {
         .then((res) => {
           this.consumableData = res.data.records;
           this.totalC = res.data.total;
-          this.listdialogLoading = false;
+          this.listdialogLoading = false
         })
         .catch((err) => {
           this.listdialogLoading = false;
@@ -734,7 +736,7 @@ export default {
     selected(row, index) {
       if (
         this.list.some((el) => {
-          return el.ybbm === row.ybbm;
+          return el.hiCode === row.hiCode;
         })
       ) {
         return false;
@@ -803,7 +805,7 @@ export default {
       this.temp.dosformName = row.dosformName;
       this.temp.specName = row.specName;
       this.temp.pacUnt = row.pacUnt;
-      this.temp.prodentpName = row.prodentpName;
+      this.temp.prodEntp = row.prodEntp;
       this.temp.pricInit = row.pricCurr ? row.pricCurr : 0;
       this.$nextTick(() => {
         this.$refs.dataForm.resetFields();
@@ -842,7 +844,7 @@ export default {
       // console.log(row, "编辑");
       this.$router.push({
         name: "catalogdetails",
-        query: { id: row.id },
+        query: { id: row.id,status:row.status },
       });
       // this.dialogDui = true;
       // this.consumableData = [];

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

@@ -129,7 +129,12 @@ import { getRetnOrdSplerPage } from "@/api/returnOrderAccept/index";
                     {value: 1, name: "采购方2"}
                 ],
                 listLoading: false,
-                list: [],
+                list: [
+                    {id:1,deltCnt:"22",amt:"112",stas:"A"},
+                    {id:2,deltCnt:"2233",amt:"1121",stas:"A"},
+                    {id:3,deltCnt:"2244",amt:"1122",stas:"A"},
+                    {id:4,deltCnt:"2255",amt:"1123",stas:"B"},
+                ],
                 total: 0,
             }
         },
@@ -157,31 +162,29 @@ import { getRetnOrdSplerPage } from "@/api/returnOrderAccept/index";
             },
             // 详情
             handleDetail(row){
-                if(row=="a"){
-                    this.$router.push('returnDetail');
-                this.$router.push({
-                    name: 'returnDetail',
-                    query: {
-                        id: row.id,
-                        orgName: row.orgName,
-                        amt: row.amt,
-                        retnDate: row.retnDate,
-                        delvDate: row.delvDate,
-                        stas: row.stas,
-                    }
-                });
+                if(row=="A"){
+                    this.$router.push({
+                        name: 'returnDetail',
+                        query: {
+                            id: row.id,
+                            orgName: row.orgName,
+                            amt: row.amt,
+                            retnDate: row.retnDate,
+                            delvDate: row.delvDate,
+                            stas: row.stas,
+                        }
+                    });
                 }else{
-                    this.$router.push('returncomDetail');
-                this.$router.push({
-                    name: 'returncomDetail',
-                    query: {
-                        id: row.id,
-                        orgName: row.orgName,
-                        amt: row.amt,
-                        retnDate: row.retnDate,
-                        delvDate: row.delvDate,
-                        stas: row.stas,
-                    }
+                    this.$router.push({
+                        name: 'returncomDetail',
+                        query: {
+                            id: row.id,
+                            orgName: row.orgName,
+                            amt: row.amt,
+                            retnDate: row.retnDate,
+                            delvDate: row.delvDate,
+                            stas: row.stas,
+                        }
                 });
                 }
                 

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

@@ -1,14 +1,15 @@
 <template>
+    <!-- 商品退货管理————待确认 -->
     <div>
         <div class="common-card">
             <h3>发起退货</h3>
             <yl-step></yl-step>
         </div>
         <div class="right-button">
-            <el-button class="lake-Blue" @click="handleConfirm">确 认</el-button>
+            <el-button type="primary" @click="handleConfirm">确 认</el-button>
             <el-button type="danger" @click="handleRefuse">拒 绝</el-button>
         </div>
-        <div class="common-card">
+         <div class="common-card">
             <h3>基本信息</h3>
             <el-form :model="listForm" ref="listform" label-width="237px" class="grid-form-class">
             <div class="form-body">
@@ -23,20 +24,18 @@
                         {{ listForm.bb }}
                     </div>
                 </el-form-item>
-            </div>
-            <div class="flex-css">
                 <el-form-item label="退货总数" prop="orgName">
                     <div class="content">
                         {{ listForm.orgName }}
                     </div>
                 </el-form-item>
+            </div>
+            <div class="flex-css">
                 <el-form-item label="退货金额" prop="dd">
                     <div class="content">
                         {{ listForm.dd }}
                     </div>
                 </el-form-item>
-            </div>
-            <div class="flex-css">
                 <el-form-item label="发起人" prop="amt">
                     <div class="content">
                         {{ listForm.amt }}
@@ -57,7 +56,7 @@
             </div>
             </div>
             </el-form>
-        </div>
+        </div> 
         <div class="common-card">
             <h3>退货明细</h3>
             <el-form :model="list" ref="listRef">
@@ -90,10 +89,10 @@
                 <el-table-column label="规格" prop="" />
                 <el-table-column label="型号" prop="" />
                 <el-table-column label="材质" prop="shppCnt" />
-                <el-table-column label="耗材名称" prop="retnCnt" />
+                <el-table-column label="生产企业" prop="retnCnt" />
                 <el-table-column label="申请数量" prop="retnAmt" />
                 <el-table-column label="价格" prop="retnAmt" />
-                <el-table-column label="金额" prop="retnAmt" />
+                <el-table-column label="金额" prop="retnAmt" /> 
                 <!-- <el-table-column label="驳回原因" prop="rejtRea" width="200">
                     <template slot-scope="scope">
                         <el-form-item
@@ -164,7 +163,7 @@
                 </el-table-column> -->
             </el-table>
             <p class="price-css">
-                合计数量：{{ amount.num }} <span></span>合计金额： {{ amount.price }}
+                合计数量：{{  }} <span></span>合计金额： {{  }}
             </p>
             </el-form>
 
@@ -172,7 +171,7 @@
                 <el-button type="primary" @click="handleAccept" :loading="aaLoad" v-if="isShow">受理</el-button>
             </div>
         </div>
-        <div class="common-card">
+        <!-- <div class="common-card">
             <h3>退货原因</h3>
             <el-form :model="listForm" ref="listform" label-width="237px" class="grid-form-class">
             <div class="form-body">
@@ -185,7 +184,7 @@
             </div>
             </div>
             </el-form>
-        </div>
+        </div> -->
     </div>
 </template>
 
@@ -248,19 +247,19 @@ import { getRetnOrdDetlList,acpRetnOrd } from "@/api/returnOrderAccept/index";
         },
         methods: {
             getData() {
-                this.listLoading = true;
-                getRetnOrdDetlList({ id: this.$route.query.id }).then((res) => {
-                    this.list = res.data;
-                    this.list.forEach((i)=>{
-                        if(i.rejtRea){
-                            i.flag = true;
-                        }
-                        item.essdrugType = this.essdrugOptions[item.essdrugType*1]
-                    })
-                    this.listLoading = false;
-                }).catch((err) => {
-                    this.listLoading = false;
-                });
+                // this.listLoading = true;
+                // getRetnOrdDetlList({ id: this.$route.query.id }).then((res) => {
+                //     this.list = res.data;
+                //     this.list.forEach((i)=>{
+                //         if(i.rejtRea){
+                //             i.flag = true;
+                //         }
+                //         item.essdrugType = this.essdrugOptions[item.essdrugType*1]
+                //     })
+                //     this.listLoading = false;
+                // }).catch((err) => {
+                //     this.listLoading = false;
+                // });
             },
             // 是否驳回开关
             handleSwitch(index,row){

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

@@ -1,4 +1,5 @@
 <template>
+    <!-- 商品退货管理————已确认 -->
     <div>
         <div class="common-card">
             <h3>发起退货</h3>
@@ -19,20 +20,18 @@
                         {{ listForm.bb }}
                     </div>
                 </el-form-item>
-            </div>
-            <div class="flex-css">
                 <el-form-item label="退货总数" prop="orgName">
                     <div class="content">
                         {{ listForm.orgName }}
                     </div>
                 </el-form-item>
+            </div>
+            <div class="flex-css">
                 <el-form-item label="退货金额" prop="dd">
                     <div class="content">
                         {{ listForm.dd }}
                     </div>
                 </el-form-item>
-            </div>
-            <div class="flex-css">
                 <el-form-item label="发起人" prop="amt">
                     <div class="content">
                         {{ listForm.amt }}

vue.config.js

@@ -44,7 +44,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.50:8505`,
+        target: `http://192.168.0.246:8602`,
         // target: `http://192.168.0.56:8502`,
         // target: `http://192.168.0.248:6000`,
         //target: `http://api.szlcloud.com/admin`,