商品退货管理

src/api/productreturnmanage-sup/returnList.js

@@ -0,0 +1,25 @@
+import request from "@/utils/request";
+// 退货汇总查询
+export function selectRetnOrdD(data) {
+    return request({
+        url:"/web/retnOrd/selectRetnOrdD",
+        method:"post",
+        data
+    })
+}
+// 退货确认明细
+export function selectRetnDetl(data) {
+    return request({
+        url:"/web/retnOrd/selectRetnDetl",
+        method:"post",
+        data
+    })
+}
+//  退货单确认拒绝--供应商端
+export function acpRetnOrd(data) {
+    return request({
+        url:"/web/retnOrd/acpRetnOrd",
+        method:"post",
+        data
+    })
+}

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

@@ -157,7 +157,7 @@
                     </template>
                 </el-table-column>
                 <!-- <el-table-column label="随货单" prop="dyntFileId" /> -->
-                <el-table-column label="备注" prop="momo" />
+                <el-table-column label="备注" prop="memo" />
                 <!-- <el-table-column label="同行单" prop="dyntFileId" width="100">
                     <template slot-scope="scope">
                         <yl-upload

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

@@ -149,14 +149,14 @@
             <el-table-column 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="qtySum"  width="100"/>
             <el-table-column label="出库数量" prop="delvCnt" />
-            <el-table-column label="订单总金额" prop="purcAmt" />
+            <el-table-column label="订单总金额" prop="purcAmt"   width="100"/>
             <el-table-column label="客户名称" prop="branchName" />
             <el-table-column label="来源部门" prop="deptName" />
-            <el-table-column label="发起时间" prop="docmkDate" width="140" />
+            <el-table-column label="发起时间" prop="docmkDate" width="160" />
             <el-table-column label="受理人" prop="acper" />
-            <el-table-column label="受理时间" prop="acpDate"  width="140" />
+            <el-table-column label="受理时间" prop="acpDate"  width="160" />
             <el-table-column label="状态" prop="stas">
               <template #default="{ row }">
                 <span v-if="row.stas == 'A'">未受理</span>
@@ -419,4 +419,11 @@ export default {
 ::v-deep .long  .el-input__inner {
   width: 199px;
 }
+.right-common-box ::v-deep .el-table__fixed {
+  height: 100% !important;
+}
+
+.right-common-box ::v-deep .el-table__fixed-right {
+  height: 100% !important;
+}
 </style>

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

@@ -168,6 +168,7 @@
                 <el-date-picker
                   style="width: 100%"
                   v-model="scope.row.manuDate"
+                  :picker-options="TimeOption1"
                   type="date"
                   placeholder="请选择生产日期"
                   value-format="yyyy-MM-dd"
@@ -192,6 +193,7 @@
                 <el-date-picker
                   style="width: 100%"
                   v-model="scope.row.prodExpy"
+                  :picker-options="TimeOption"
                   type="date"
                   placeholder="请选择有效期"
                   value-format="yyyy-MM-dd"
@@ -665,6 +667,16 @@ export default {
           { value: "0", name: "是" },
           { value: "1", name: "否" },
       ],
+      TimeOption: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+      TimeOption1: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
     };
   },
   created() {
@@ -1147,11 +1159,7 @@ export default {
     },
     // 出库
     handleDelivery() {
-      this.$refs.tabledata.validate((valid) => {
-        if (valid) {
-          this.tableData.forEach((item) => {
-        console.log(item.manuDate)
-        // console.log(item, "item");
+      this.tableData.forEach((item) => {
         if (item.delvCnt=='0') {
           this.$message({
             message: "本次出库数量必须大于0",
@@ -1167,16 +1175,9 @@ export default {
           });
           throw new Error("请填写相应信息，并选择报关单");
         }
-        item.manuDate = new Date(item.manuDate);
-        item.prodExpy = new Date(item.prodExpy);
-        if (item.manuDate.getTime() > item.prodExpy.getTime()) {
-          this.$message({
-            message: "生产日期不能大于有效期",
-            type: "warning",
-          });
-          throw new Error("生产日期不能大于有效期");
-        }
       });
+      this.$refs.tabledata.validate((valid) => {
+        if (valid) {
           this.$confirm("确认出库", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

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

@@ -75,6 +75,7 @@
                   style="width: 100%"
                   v-model="scope.row.manuDate"
                   type="date"
+                  :picker-options="TimeOption1"
                   placeholder="请选择生产日期"
                   value-format="yyyy-MM-dd"
                 />
@@ -100,6 +101,7 @@
                   v-model="scope.row.prodExpy"
                   type="date"
                   placeholder="请选择有效期"
+                  :picker-options="TimeOption"
                   value-format="yyyy-MM-dd"
                 />
               </el-form-item>
@@ -328,6 +330,16 @@ export default {
         { value: "0", name: "是" },
         { value: "1", name: "否" },
       ],
+      TimeOption: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+      TimeOption1: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
     };
   },
   methods: {

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

@@ -1,214 +1,256 @@
 <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-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="orgId">
-                    <el-select
-                        v-model="listQuery.orgId"
-                        placeholder="请选择"
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in dd1"
-                            :key="item.value"
-                            :label="item.name"
-                            :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="bb">
-                    <el-date-picker
-                    v-model="listQuery.bb"
-                    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="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="deltCnt" />
-                <el-table-column label="退货总数" prop="amt" />
-                <el-table-column label="退货金额" prop="orgName" />
-                <el-table-column label="客户名称" prop="orgName" />
-                <el-table-column label="发起人" prop="orgName" />
-                <el-table-column label="发起时间" prop="orgName" />
-                <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>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" width="100">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            @click="handleDetail(scope.row.stas)"
-                            >详情</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 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-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="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>
+      <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="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="当前状态" 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>
+          </template>
+        </el-table-column>
+        <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 { getRetnOrdSplerPage } from "@/api/returnOrderAccept/index";
-    export default {
-        components: {
-            ylPagination
-        },
-        data() {
-            return {
-                listQuery:{
-                    current: 1,
-                    size: 10,
-                    id: "",
-                    orgId: "",
-                    stas: "",
-                    // bb: "",
-                },
-                stasOptions: [
-                    {value: 'A', lable: "未受理"},
-                    {value: 'B', lable: "已受理"},
-                    {value: 'R', lable: "被驳回"},
-                    {value: 'C', lable: "已出库"},
-                    {value: 'D', lable: "部分出库"},
-                    {value: 'Y', lable: "已入库"},
-                    {value: 'P', lable: "部分入库"}
-                ],
-                dd1: [
-                    {value: 0, name: "采购方1"},
-                    {value: 1, name: "采购方2"}
-                ],
-                listLoading: false,
-                list: [
-                    {id:1,deltCnt:"2211",amt:"1120",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,
-            }
-        },
-        mounted () {
-            this.getData();
-        },
-        methods: {
-            getData(type) {
-                if (type == "search") {
-                    this.listQuery.current = 1;
-                }
-                this.listLoading = true;
-                getRetnOrdSplerPage(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.getData();
-            },
-            // 详情
-            handleDetail(row){
-                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({
-                        name: 'returncomDetail',
-                        query: {
-                            id: row.id,
-                            orgName: row.orgName,
-                            amt: row.amt,
-                            retnDate: row.retnDate,
-                            delvDate: row.delvDate,
-                            stas: row.stas,
-                        }
-                });
-                }
-                
-            },
-        },
-    }
+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: "",
+        // bb: "",
+      },
+      stasOptions: [
+        { value: "A", lable: "未受理" },
+        { value: "B", lable: "已受理" },
+        { value: "R", lable: "被驳回" },
+        { value: "C", lable: "已出库" },
+        { value: "D", lable: "部分出库" },
+        { value: "Y", lable: "已入库" },
+        { value: "P", lable: "部分入库" },
+      ],
+      dd1: [
+        { value: 0, name: "采购方1" },
+        { value: 1, name: "采购方2" },
+      ],
+      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.list =[
+            { id: 1, deltCnt: "2211", amt: "1120", 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" },
+        ]
+          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")
+      if (row.stas == "A") {
+        this.$router.push({
+          name: "returnDetail",
+          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,
+          },
+        });
+      } else {
+        this.$router.push({
+          name: "returncomDetail",
+          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
+          },
+        });
+      }
+    },
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

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

@@ -1,403 +1,350 @@
 <template>
-    <!-- 商品退货管理————待确认 -->
-    <div>
-        <!-- <div class="common-card">
-            <h3>发起退货</h3>
-            <yl-step></yl-step>
-        </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="bb">
-                    <div class="content">
-                        {{ listForm.bb }}
-                    </div>
-                </el-form-item>
-                <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>
-                <el-form-item label="发起人" prop="amt">
-                    <div class="content">
-                        {{ listForm.amt }}
-                    </div>
-                </el-form-item>
-                <el-form-item label="发起时间" prop="retnDate">
-                    <div class="content">
-                        {{ listForm.retnDate }}
-                    </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="materialId" />
-                <el-table-column label="耗材名称" prop="prodName" width="300" >
-                </el-table-column>
-                <el-table-column label="商品类别" prop="mcsType" />
-                <el-table-column label="规格" prop="spec" />
-                <el-table-column label="型号" prop="mol" />
-                <el-table-column label="材质" prop="matl" />
-                <el-table-column label="生产企业" prop="prodEntp" />
-                <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
-                            label-width="0"
-                            class="item"
-                            :prop="scope.$index + '.rejtRea'"
-                            :rules="[
-                            {
-                                required: true,
-                                message: '请输入',
-                                trigger: 'blur',
-                            },
-                            ]"
-                            v-if="isShow"
-                        >
-                            <el-input placeholder="请输入" v-model="scope.row.rejtRea"></el-input>
-                        </el-form-item>
-                        <el-form-item
-                            label-width="0"
-                            class="item"
-                            :prop="scope.$index + '.rejtRea'"
-                            v-else
-                        >
-                            <el-input placeholder="请输入" v-model="scope.row.rejtRea" readonly></el-input>
-                        </el-form-item>
-                    </template>
-                </el-table-column> -->
-                <!-- <el-table-column fixed="right" 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 fixed="right" label="操作" width="100">
-                    <template slot-scope="scope">
-                        <el-popconfirm
-                            title="是否取消驳回？"
-                            @confirm="handleNoReject(scope.row)"
-                            confirm-button-text="确定"
-                            cancel-button-text="取消"
-                            icon="el-icon-info"
-                            icon-color="red"
-                            v-if="scope.row.rejtRea"
-                        >
-                            <el-button
-                                class="red"
-                                type="text"
-                                slot="reference"
-                                >取消驳回</el-button
-                            >
-                        </el-popconfirm>
-                        <el-popconfirm
-                            title="是否驳回？"
-                            @confirm="handleReject(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>
-            <p class="price-css">
-                合计数量：{{  }} <span></span>合计金额： {{  }}
-            </p>
-            </el-form>
-
-            <!-- <div class="foot-button">
-                <el-button type="primary" @click="handleAccept" :loading="aaLoad" v-if="isShow">受理</el-button>
-            </div> -->
+  <!-- 商品退货管理————待确认 -->
+  <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>
-        <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="stas">
-                    <el-input
-                        v-model="listForm.fasBtch"
-                        placeholder="请输入退货原因"
-                    ></el-input>
-                </el-form-item>
-            </div>
-            </div>
-            </el-form>
+      </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" />
+          <el-table-column label="采购单位" prop="purcUnt" />
+          <el-table-column label="包装内数量" prop="convrat" />
+          <el-table-column label="最小单位" prop="prcUnt" />
+          <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"
+                placeholder="请输入退货原因"
+                
+              ></el-input>
+            </el-form-item>
+          </div>
         </div>
+      </el-form>
     </div>
+  </div>
 </template>
 
 <script>
 import ylStep from "@/components/yl-step";
 import ylPagination from "@/components/yl-pagination";
-import { getRetnOrdDetlList,acpRetnOrd } from "@/api/returnOrderAccept/index";
-    export default {
-        components:{
-            ylStep,ylPagination
-        },
-        data() {
-            return {
-                listForm: {
-                    id: "",
-                    bb: "信息",
-                    orgName: "",
-                    dd: "信息",
-                    amt: "",
-                    retnDate: "",
-                    delvDate: "",
-                    stas: "",
-                },
-                stasOptions: [
-                    {value: 'A', lable: "未受理"},
-                    {value: 'B', lable: "已受理"},
-                    {value: 'R', lable: "被驳回"},
-                    {value: 'C', lable: "已出库"},
-                    {value: 'D', lable: "部分出库"},
-                    {value: 'Y', lable: "已入库"},
-                    {value: 'P', lable: "部分入库"}
-                ],
-                essdrugOptions: ["非基药","基药"],
-                listLoading: false,
-                list:[],
-                aaLoad: false,
-                selectData: [],
-                isShow: false,
-                sureLoading:false,
-                refuseLoading:false,
+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() {
+    if (this.$route.query.stas == "A") {
+      this.isShow = true;
+    } else {
+      this.isShow = false;
+    }
+    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.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;
+        });
+    },
+    // 确认退货
+    handleConfirm() {
+        if(this.listForm.rejtRea==""){
+            this.$message({
+            message: "填写退货原因",
+            type: "warning",
+          });
+          throw new Error("填写退货原因");
+        }
+      this.$confirm("确认退货", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.sureLoading = true;
+        let data = {
+          id: this.$route.query.id,
+          spdId: this.$route.query.spdId,
+          stas: "B",
+          rejtRea: this.listForm.rejtRea,
+        };
+        acpRetnOrd(data)
+          .then((res) => {
+            if (res.success == true) {
+              this.sureLoading = false;
+              this.$router.push({
+                name: "returnOrderAccept",
+                query: { spdId: this.$route.query.spdId },
+              });
+            } else {
+              this.sureLoading = false;
+              this.$message.error("确认失败");
             }
-        },
-        created() {
-            if(this.$route.query.stas == 'A'){
-                this.isShow = true;
-            }else{
-                this.isShow = false;
+          })
+          .catch((err) => {
+            this.sureLoading = false;
+          });
+      });
+    },
+    // 拒绝退货
+    handleRefuse() {
+        if(this.listForm.rejtRea==""){
+            this.$message({
+            message: "填写拒绝原因",
+            type: "warning",
+          });
+          throw new Error("填写拒绝原因");
+        }
+      this.$confirm("确认退货", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.refuseLoading = true;
+        let data = {
+          id: this.$route.query.id,
+          spdId: this.$route.query.spdId,
+          stas: "R",
+          rejtRea: this.listForm.rejtRea,
+        };
+        acpRetnOrd(data)
+          .then((res) => {
+            if (res.success == true) {
+              this.refuseLoading = false;
+              this.$router.push({
+                name: "returnOrderAccept",
+                query: { spdId: this.$route.query.spdId },
+              });
+            } else {
+              this.refuseLoading = false;
+              this.$message.error("拒绝失败");
             }
-            this.listForm.id = this.$route.query.id;
-            this.listForm.orgName = this.$route.query.orgName;
-            this.listForm.amt = this.$route.query.amt;
-            this.listForm.retnDate = this.$route.query.retnDate;
-            this.listForm.delvDate = this.$route.query.delvDate;
-            this.stasOptions.forEach((i)=>{
-                if(i.value == this.$route.query.stas){
-                    this.listForm.stas = i.lable
-                }
-            })
-        },
-        mounted () {
-            this.getData();
-        },
-        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;
-                // });
-            },
-            // 确认退货
-            handleConfirm(){
-                this.$confirm("确认退货", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    this.sureLoading = true;
-                    // let data = this.list.filter((i)=>{
-                    //     if(i.flag == true){ return i }
-                    // })
-                    // let data2 = data.map((i)=>{
-                    //     return {"id":i.id,"rejtRea":i.rejtRea}
-                    // })
-
-                    // let data2 = this.selectData.map((i)=>{
-                    //     return {"id":i.id,"rejtRea":i.rejtRea}
-                    // })
-                    // let data3 = {
-                    //     id: this.$route.query.id,
-                    //     detlList: data2
-                    // }
-                    // console.log(data3,'data3')
-                    // acpRetnOrd(data3).then((res) => {
-                    //     this.sureLoading = false;
-                    //     this.$router.push('returnOrderAccept')
-                    // }).catch((err) => {
-                    //     this.sureLoading = false;
-                    // });
-                })
-            },
-            // 拒绝退货
-            handleConfirm(){
-                this.$confirm("确认退货", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    this.refuseLoading = true;
-                    // let data = this.list.filter((i)=>{
-                    //     if(i.flag == true){ return i }
-                    // })
-                    // let data2 = data.map((i)=>{
-                    //     return {"id":i.id,"rejtRea":i.rejtRea}
-                    // })
+          })
+          .catch((err) => {
+            this.refuseLoading = false;
+          });
+      });
+    },
 
-                    // let data2 = this.selectData.map((i)=>{
-                    //     return {"id":i.id,"rejtRea":i.rejtRea}
-                    // })
-                    // let data3 = {
-                    //     id: this.$route.query.id,
-                    //     detlList: data2
-                    // }
-                    // console.log(data3,'data3')
-                    // acpRetnOrd(data3).then((res) => {
-                    //     this.refuseLoading = false;
-                    //     this.$router.push('returnOrderAccept')
-                    // }).catch((err) => {
-                    //     this.refuseLoading = false;
-                    // });
-                })
-            },
+    // 是否驳回开关
+    handleSwitch(index, row) {
+      if (row.flag == false) {
+        row.rejtRea = "";
+      }
+    },
+    // 驳回
+    handleReject(row) {
+      this.$refs.listRef.validate((valid) => {
+        if (valid) {
+        }
+      });
+    },
+    // 取消驳回
+    handleNoReject(row) {},
+    // 多选
+    handleSelectionChange(e) {
+      this.selectData = e;
+    },
+    // 受理
+    handleAccept() {
+      if (this.selectData.length == 0) {
+        this.$message({
+          message: "请选择明细信息",
+          type: "warning",
+        });
+        throw new Error("请选择明细信息");
+      }
+      this.selectData.forEach((e) => {
+        if (e.flag == true && !e.rejtRea) {
+          this.$message({
+            message: "选择是否驳回后请填写驳回原因",
+            type: "warning",
+          });
+          throw new Error("选择是否驳回后请填写驳回原因");
+        }
+      });
+      this.$confirm("确认受理", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        console.log(this.selectData, "selectData");
+        // let data = this.list.filter((i)=>{
+        //     if(i.flag == true){ return i }
+        // })
+        // let data2 = data.map((i)=>{
+        //     return {"id":i.id,"rejtRea":i.rejtRea}
+        // })
 
-
-
-
-
-
-            // 是否驳回开关
-            handleSwitch(index,row){
-                if(row.flag == false){
-                    row.rejtRea = ""
-                }
-            },
-            // 驳回
-            handleReject(row){
-                this.$refs.listRef.validate((valid)=>{
-                    if(valid){
-                        
-                    }
-                })
-            },
-            // 取消驳回
-            handleNoReject(row){ 
-            },
-            // 多选
-            handleSelectionChange(e){
-                this.selectData = e;
-            },
-            // 受理
-            handleAccept(){
-                if(this.selectData.length == 0){
-                    this.$message({
-                        message: '请选择明细信息',
-                        type: 'warning'
-                    });
-                    throw new Error("请选择明细信息");
-                }
-                this.selectData.forEach((e)=>{
-                    if(e.flag == true && !e.rejtRea){
-                        this.$message({
-                            message: "选择是否驳回后请填写驳回原因",
-                            type: "warning",
-                        });
-                        throw new Error("选择是否驳回后请填写驳回原因");
-                    }
-                })
-                this.$confirm("确认受理", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    console.log(this.selectData,'selectData')
-                    // let data = this.list.filter((i)=>{
-                    //     if(i.flag == true){ return i }
-                    // })
-                    // let data2 = data.map((i)=>{
-                    //     return {"id":i.id,"rejtRea":i.rejtRea}
-                    // })
-
-                    let data2 = this.selectData.map((i)=>{
-                        return {"id":i.id,"rejtRea":i.rejtRea}
-                    })
-                    let data3 = {
-                        id: this.$route.query.id,
-                        detlList: data2
-                    }
-                    console.log(data3,'data3')
-                    this.aaLoad = true;
-                    acpRetnOrd(data3).then((res) => {
-                        this.aaLoad = false;
-                        this.$router.push('returnOrderAccept')
-                    }).catch((err) => {
-                        this.aaLoad = false;
-                    });
-                })
-            },
-        },
-    }
+        let data2 = this.selectData.map((i) => {
+          return { id: i.id, rejtRea: i.rejtRea };
+        });
+        let data3 = {
+          id: this.$route.query.id,
+          detlList: data2,
+        };
+        console.log(data3, "data3");
+        this.aaLoad = true;
+        acpRetnOrd(data3)
+          .then((res) => {
+            this.aaLoad = false;
+            this.$router.push("returnOrderAccept");
+          })
+          .catch((err) => {
+            this.aaLoad = false;
+          });
+      });
+    },
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

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

@@ -1,344 +1,208 @@
 <template>
-    <!-- 商品退货管理————已确认 -->
-    <div>
-        <!-- <div class="common-card">
-            <h3>发起退货</h3>
-            <yl-step></yl-step>
-        </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="bb">
-                    <div class="content">
-                        {{ listForm.bb }}
-                    </div>
-                </el-form-item>
-                <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>
-                <el-form-item label="发起人" prop="amt">
-                    <div class="content">
-                        {{ listForm.amt }}
-                    </div>
-                </el-form-item>
-                <el-form-item label="发起时间" prop="retnDate">
-                    <div class="content">
-                        {{ listForm.retnDate }}
-                    </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="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>
-        <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 fixed type="index" label="序号" width="60"/>
-                <el-table-column label="耗材编码" prop="materialId" />
-                <el-table-column label="耗材名称" prop="prodName" width="300" >
-                </el-table-column>
-                <el-table-column label="商品类别" prop="mcsType" />
-                <el-table-column label="规格" prop="spec" />
-                <el-table-column label="型号" prop="mol" />
-                <el-table-column label="材质" prop="matl" />
-                <el-table-column label="生产企业" prop="prodEntp" />
-                <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
-                            label-width="0"
-                            class="item"
-                            :prop="scope.$index + '.rejtRea'"
-                            :rules="[
-                            {
-                                required: true,
-                                message: '请输入',
-                                trigger: 'blur',
-                            },
-                            ]"
-                            v-if="isShow"
-                        >
-                            <el-input placeholder="请输入" v-model="scope.row.rejtRea"></el-input>
-                        </el-form-item>
-                        <el-form-item
-                            label-width="0"
-                            class="item"
-                            :prop="scope.$index + '.rejtRea'"
-                            v-else
-                        >
-                            <el-input placeholder="请输入" v-model="scope.row.rejtRea" readonly></el-input>
-                        </el-form-item>
-                    </template>
-                </el-table-column> -->
-                <!-- <el-table-column fixed="right" 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 fixed="right" label="操作" width="100">
-                    <template slot-scope="scope">
-                        <el-popconfirm
-                            title="是否取消驳回？"
-                            @confirm="handleNoReject(scope.row)"
-                            confirm-button-text="确定"
-                            cancel-button-text="取消"
-                            icon="el-icon-info"
-                            icon-color="red"
-                            v-if="scope.row.rejtRea"
-                        >
-                            <el-button
-                                class="red"
-                                type="text"
-                                slot="reference"
-                                >取消驳回</el-button
-                            >
-                        </el-popconfirm>
-                        <el-popconfirm
-                            title="是否驳回？"
-                            @confirm="handleReject(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>
-            <p class="price-css">
-                合计数量： <span></span>合计金额： 
-            </p>
-            </el-form>
-
-            <div class="foot-button">
-                <el-button type="primary" @click="handleAccept" :loading="aaLoad" v-if="isShow">受理</el-button>
-            </div>
-        </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="stas">
-                    <div class="content">
-                        {{ listForm.stas }}
-                    </div>
-                </el-form-item>
-            </div>
-            </div>
-            </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="stas">
-                    <div class="content">
-                        {{ listForm.stas }}
-                    </div>
-                </el-form-item>
-            </div>
-            </div>
-            </el-form>
+      </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" />
+          <el-table-column label="采购单位" prop="purcUnt" />
+          <el-table-column label="包装内数量" prop="convrat" />
+          <el-table-column label="最小单位" prop="prcUnt" />
+          <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 { getRetnOrdDetlList,acpRetnOrd } from "@/api/returnOrderAccept/index";
-    export default {
-        components:{
-            ylStep,ylPagination
-        },
-        data() {
-            return {
-                listForm: {
-                    id: "",
-                    bb: "信息",
-                    orgName: "",
-                    dd: "信息",
-                    amt: "",
-                    retnDate: "",
-                    delvDate: "",
-                    stas: "",
-                },
-                stasOptions: [
-                    {value: 'A', lable: "未受理"},
-                    {value: 'B', lable: "已受理"},
-                    {value: 'R', lable: "被驳回"},
-                    {value: 'C', lable: "已出库"},
-                    {value: 'D', lable: "部分出库"},
-                    {value: 'Y', lable: "已入库"},
-                    {value: 'P', lable: "部分入库"}
-                ],
-                essdrugOptions: ["非基药","基药"],
-                listLoading: false,
-                list:[],
-                aaLoad: false,
-                selectData: [],
-                isShow: false,
-            }
-        },
-        created() {
-            if(this.$route.query.stas == 'A'){
-                this.isShow = true;
-            }else{
-                this.isShow = false;
-            }
-            this.listForm.id = this.$route.query.id;
-            this.listForm.orgName = this.$route.query.orgName;
-            this.listForm.amt = this.$route.query.amt;
-            this.listForm.retnDate = this.$route.query.retnDate;
-            this.listForm.delvDate = this.$route.query.delvDate;
-            this.stasOptions.forEach((i)=>{
-                if(i.value == this.$route.query.stas){
-                    this.listForm.stas = i.lable
-                }
-            })
-        },
-        mounted () {
-            this.getData();
-        },
-        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;
-                });
-            },
-            // 是否驳回开关
-            handleSwitch(index,row){
-                if(row.flag == false){
-                    row.rejtRea = ""
-                }
-            },
-            // 驳回
-            handleReject(row){
-                this.$refs.listRef.validate((valid)=>{
-                    if(valid){
-                        
-                    }
-                })
-            },
-            // 取消驳回
-            handleNoReject(row){
-                
-            },
-            // 多选
-            handleSelectionChange(e){
-                this.selectData = e;
-            },
-            // 受理
-            handleAccept(){
-                if(this.selectData.length == 0){
-                    this.$message({
-                        message: '请选择明细信息',
-                        type: 'warning'
-                    });
-                    throw new Error("请选择明细信息");
-                }
-                this.selectData.forEach((e)=>{
-                    if(e.flag == true && !e.rejtRea){
-                        this.$message({
-                            message: "选择是否驳回后请填写驳回原因",
-                            type: "warning",
-                        });
-                        throw new Error("选择是否驳回后请填写驳回原因");
-                    }
-                })
-                this.$confirm("确认受理", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning"
-                }).then(() => {
-                    console.log(this.selectData,'selectData')
-                    // let data = this.list.filter((i)=>{
-                    //     if(i.flag == true){ return i }
-                    // })
-                    // let data2 = data.map((i)=>{
-                    //     return {"id":i.id,"rejtRea":i.rejtRea}
-                    // })
+import mcsInfo from "@/views/components/mcs-info.vue";
+import { selectRetnDetl, acpRetnOrd } from "@/api/productreturnmanage-sup/returnList";
 
-                    let data2 = this.selectData.map((i)=>{
-                        return {"id":i.id,"rejtRea":i.rejtRea}
-                    })
-                    let data3 = {
-                        id: this.$route.query.id,
-                        detlList: data2
-                    }
-                    console.log(data3,'data3')
-                    this.aaLoad = true;
-                    acpRetnOrd(data3).then((res) => {
-                        this.aaLoad = false;
-                        this.$router.push('returnOrderAccept')
-                    }).catch((err) => {
-                        this.aaLoad = false;
-                    });
-                })
-            },
-        },
+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>
+<style lang="scss" scoped></style>