出库需求修改

耗材目录管理
标签页添加

src/api/orderManage-sup/index.js

@@ -41,8 +41,15 @@ export function getMcsOrdDck(data) {
         method:"post",
         data
     })
-}
-
+} 
+// 结束订单 /web/delvOrd/finishMcsDelvOrd
+export function finishMcsDelvOrd(data) {
+    return request({
+        url:"/web/delvOrd/finishMcsDelvOrd",
+        method:"post",
+        data
+    })
+} 
 // 供应商采购订单（待出库详情）
 export function getMcsOrdDckDetl(data) {
     return request({

src/layout/components/AppMain.vue

@@ -35,7 +35,7 @@ export default {
 
 <style lang="scss" scoped>
 .app-main1 {
-  height: calc(100vh - 90px);
+  height: calc(100vh - 125px);
   width: 100%;
   position: relative;
   overflow: hidden;

src/settings.js

@@ -16,7 +16,7 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether need tagsView
    */
-  tagsView: false,
+  tagsView: true,
 
   /**
    * @type {boolean} true | false

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

@@ -1,4 +1,5 @@
 <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>
@@ -14,13 +15,129 @@
       ></el-tree> 
     </el-card>-->
     <div class="right-common-box">
-      <el-form :model="listQuery" ref="listQuery" :inline="true">
+      <el-form :model="listQuery" ref="listQuery" :inline="true" label-width="100px">
+        <el-form-item label="耗材编码" prop="drugName" class="long">
+          <el-input
+            v-model="listQuery.drugName"
+            placeholder="请输入耗材编码"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="医保编码" prop="drugName" class="long">
+          <el-input
+            v-model="listQuery.drugName"
+            placeholder="请输入医保编码"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="耗材名称" prop="drugName" class="long">
           <el-input
             v-model="listQuery.drugName"
             placeholder="请输入耗材名称"
           ></el-input>
         </el-form-item>
+        <el-form-item label="是否集采" prop="drugName" 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.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="集采批次" prop="drugName" 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.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商品类别" prop="drugName" 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.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="规格" prop="drugName" class="long">
+          <el-input
+            v-model="listQuery.drugName"
+            placeholder="请输入规格"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="型号" prop="drugName" class="long">
+          <el-input
+            v-model="listQuery.drugName"
+            placeholder="请输入型号"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="材质" prop="drugName" class="long">
+          <el-input
+            v-model="listQuery.drugName"
+            placeholder="请输入材质"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="生产来源" prop="drugName" 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.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产企业" prop="drugName" 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.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="当前状态" prop="drugName" 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.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item label="对码状态" prop="stas">
           <el-select
             v-model="listQuery.stas"
@@ -64,8 +181,8 @@
         <el-table-column label="医保编码" prop="drugListId" width="80" />
         <el-table-column label="耗材名称" prop="drugListId" width="80" />
         <el-table-column label="是否集采" prop="drugListId" width="80" />
+        <el-table-column label="集采批次" prop="drugListId" width="80" />
         <el-table-column label="商品类别" prop="drugListId" width="80" />
-        <el-table-column label="商品分类" prop="drugListId" width="80" />
         <el-table-column label="规格" prop="drugListId" width="80" />
         <el-table-column label="型号" prop="drugListId" width="80" />
         <el-table-column label="材质" prop="drugListId" width="80" />
@@ -74,37 +191,6 @@
         <el-table-column label="生产企业" prop="drugListId" width="80" />
         <el-table-column label="采购价" prop="drugListId" width="80" />
         <el-table-column label="当前状态" prop="drugListId" width="80" />
-        <!-- <el-table-column label="医院药品名称" prop="drugName" width="260">
-          <template slot-scope="scope">
-            <div class="drug-name">
-              <el-tag>{{ scope.row.drugName }}</el-tag
-              >{{ "【" + scope.row.dosformName + "】" }}
-              <el-tag>{{ scope.row.essdrugType }}</el-tag
-              ><br />
-              {{ "医院厂家 【" + scope.row.prodentpName + "】" }}<br />
-              {{"医院规格 【" +scope.row.specName +"*" +scope.row.convrat +scope.row.prepunt +"/" +scope.row.pacUnt +"】"}}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="对码状态" prop="stas">
-          <template #default="{ row }">
-            <span v-if="row.stas == '0'" style="color:red;">未对码</span>
-            <span v-if="row.stas == '1'" style="color:lawngreen;">已对码</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="转化比" prop="convrat" />
-        <el-table-column label="供应商药品名称" prop="splerDrugName" width="260">
-          <template slot-scope="scope">
-            <div class="drug-name" v-if="scope.row.splerDrugName">
-              <el-tag>{{ scope.row.splerDrugName }}</el-tag>
-              {{ "【" + scope.row.splerDosformName + "】" }}
-              <el-tag>{{ scope.row.splerEssdrugType }}</el-tag><br />
-              {{ "供应商厂家 【" + scope.row.splerProdentpName + "】" }}<br />
-              {{ "供应商规格 【" +scope.row.splerSpecName +"*" +scope.row.convrat +scope.row.splerPrepunt +"/" +scope.row.splerPacUnt +"】"}}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商价格" prop="splerPurcPric" /> -->
         <el-table-column fixed="right" label="操作" width="160">
           <template slot-scope="scope">
             <div>
@@ -239,13 +325,80 @@
         >
       </div>
     </el-dialog>
-    <el-dialog title="选择耗材" :visible.sync="dialogAdd" width="55%">
+    <el-dialog title="选择耗材" :visible.sync="dialogAdd" width="75%">
       <template>
-        <h3 style="margin:10px 0;">选择耗材</h3>
-        <el-table :data="selectDrguData" border style="width: 100%">
-          <el-table-column fixed prop="drugName" label="医保编码" width="150">
+        <el-form :model="listQueryadd" ref="listQuery" :inline="true">
+        <el-form-item label="耗材名称" prop="drugName" class="long">
+          <el-input
+            v-model="listQueryadd.drugName"
+            placeholder="请输入耗材名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="耗材规格" prop="drugName" class="long">
+          <el-input
+            v-model="listQueryadd.drugName"
+            placeholder="请输入耗材规格"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="耗材编码" prop="drugName" class="long">
+          <el-input
+            v-model="listQueryadd.drugName"
+            placeholder="请输入耗材编码"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="医保编码" prop="drugName" class="long">
+          <el-input
+            v-model="listQueryadd.drugName"
+            placeholder="请输入医保编码"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否集采" prop="drugName" 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.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 crspFlgOption"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="getdialog('search')"
+            >查询</el-button
+          >
+          <el-button @click="resetdialog('drug')">重置</el-button>
+        </el-form-item>
+      </el-form>
+        <el-table :data="selectDrguData" border style="width: 100%" row-key="id"
+              @selection-change="handleSelectionChange"
+              @row-click="getDetail">
+          <el-table-column
+            type="selection"
+            :selectable="selected"
+            :reserve-selection="true"
+            width="55"
+          ></el-table-column>
+          <el-table-column prop="drugName" label="医保编码" width="150">
           </el-table-column>
-          <el-table-column fixed prop="drugName" label="耗材名称" width="150">
+          <el-table-column prop="drugName" label="耗材名称" width="150">
           </el-table-column>
           <el-table-column prop="dosformName" label="是否集采" width="120">
           </el-table-column>
@@ -253,10 +406,12 @@
           </el-table-column>
           <el-table-column prop="drugListId" label="商品类别" width="120">
           </el-table-column>
-          <el-table-column prop="specName" label="规格" width="300">
+          <el-table-column prop="drugListId" label="商品分类" width="120">
+          </el-table-column>
+          <el-table-column prop="specName" label="规格">
             <template slot-scope="scope">
               <div class="drug-name">
-                {{
+                <!-- {{
                   "医院规格 【" +
                     scope.row.specName +
                     "*" +
@@ -265,23 +420,26 @@
                     "/" +
                     scope.row.pacUnt +
                     "】"
-                }}
+                }} -->
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="drugListId" label="型号" width="120">
+          <el-table-column prop="drugListId" label="型号">
           </el-table-column>
-          <el-table-column prop="drugListId" label="材质" width="120">
+          <el-table-column prop="drugListId" label="材质">
           </el-table-column>
-          <el-table-column prop="drugListId" label="包装材质" width="120">
+          <el-table-column prop="drugListId" label="包装材质">
           </el-table-column>
-          <el-table-column prop="drugListId" label="生产来源" width="120">
+          <el-table-column prop="drugListId" label="生产来源">
           </el-table-column>
-          <el-table-column prop="drugListId" label="注册证号" width="120">
+          <el-table-column prop="drugListId" label="注册证号">
           </el-table-column>
           <el-table-column prop="drugListId" label="生产企业" width="120">
           </el-table-column>
         </el-table>
+        <div  slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="handleConfirm" v-loading="addLoading">确认</el-button>
+        </div>
         <!-- <el-form :model="form" ref="form" :rules="rules">
           <el-table
             :data="form.splerData"
@@ -401,6 +559,10 @@ export default {
         { value: "0", name: "未对码" },
         { value: "1", name: "已对码" }
       ],
+      isFasData: [
+        { value: "0", name: "否" },
+        { value: "1", name: "是" }
+      ],
       dialogPrice: false,
       dialogDui: false,
       ccLoad: false,
@@ -484,6 +646,10 @@ export default {
         splerData: []
       },
       dialogAdd:false,
+      listQueryadd:{
+
+      },
+      addLoading:false,
     };
   },
   methods: {
@@ -537,6 +703,23 @@ export default {
           this.listLoading = false;
         });
     },
+    // 获取新增目录弹框数据
+    getdialog(type) {
+      if (type == "search") {
+        this.listQueryadd.current = 1;
+      }
+      // this.listLoading = true;
+      // this.listQuery.hospId = this.hospId;
+      // QueryHospDrugList(this.listQuery)
+        // .then(res => {
+          // this.list = res.data.records;
+          // this.total = res.data.total;
+          // this.listLoading = false;
+        // })
+        // .catch(err => {
+          // this.listLoading = false;
+        // });
+    },
     // 点击获取医院药品列表
     handleNodeClick(data) {
       this.listLoading = true;
@@ -696,7 +879,15 @@ export default {
         .catch(err => {
           this.supLoading = false;
         });
-    }
+    },
+    // 新增目录确认
+    handleConfirm(){
+      this.addLoading = true;
+
+      // this.addLoading = false;
+      // this.dialogAdd = false;
+
+    },
   },
   mounted() {
     this.getData();
@@ -720,4 +911,8 @@ export default {
 ::v-deep .long .el-form-item__content {
   width: 220px;
 }
+::v-deep .long .el-input__inner {
+  width: 199px;
+}
+
 </style>

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

@@ -1,4 +1,5 @@
 <template>
+    <!-- 已出库 -->
     <div>
         <!-- <div class="common-card">
             <h3>订单状态</h3>
@@ -383,7 +384,7 @@ import { getOrdDetlList,finishDelvOrd } from "@/api/orderManage-sup/index";
                         console.log("索引", 0, this.count);
                     } else {
                         // 判断当前项与上项的设备类别是否相同，因为是合并这一列的单元格
-                        if (tableData[i].drugListId == tableData[i - 1].drugListId) {
+                        if (tableData[i].materialId == tableData[i - 1].materialId) {
                             this.cellList[this.count] += 1; // 增加计数
                             this.cellList.push(0); // 相等就往cellList数组中追加0
                             console.log("索引", i, this.count);

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

@@ -278,17 +278,17 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        // 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 data = this.list.filter((i) => {
+          if (i.flag == true) {
+            return i;
+          }
+        });
+        let data2 = data.map((i) => {
+          return { id: i.id, rejtRea: i.rejtRea };
+        });
         let data3 = {
           id: this.$route.query.id,
-          //   rejtList: data2,
+          rejtList: data2,
         };
         this.aaLoad = true;
         acpMcsOrd(data3)

src/views/page/orderManage-sup/purOrderConfirmed/confirmDetail.vue

@@ -102,7 +102,7 @@
           <el-table-column label="采购时间" prop="deptName" />
           <el-table-column label="订单发起人" prop="docmker" width="100" />
           <el-table-column label="备注" prop="memo" />
-          <!-- <el-table-column label="驳回原因" prop="rejtRea" width="200">
+          <el-table-column label="驳回原因" prop="rejtRea" width="200">
                       <template slot-scope="scope">
                           <el-form-item
                               label-width="0"
@@ -112,12 +112,12 @@
                               <el-input placeholder="请输入" v-model="scope.row.rejtRea" :readonly="!returnInfo"></el-input>
                           </el-form-item>
                       </template>
-                  </el-table-column> -->
-          <!-- <el-table-column label="是否驳回" width="100">
+                  </el-table-column>
+          <el-table-column label="是否驳回" width="100">
                       <template slot-scope="scope">
                           <el-switch v-model="scope.row.flag" @change="handleSwitch(scope.$index,scope.row)" :disabled="!isShow"></el-switch>
                       </template>
-                  </el-table-column> -->
+                  </el-table-column>
           <!-- <el-table-column label="操作" width="100">
                       <template slot-scope="scope">
                           <el-popconfirm

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

@@ -1,4 +1,5 @@
 <template>
+  <!-- 待出库 -->
   <div>
     <!-- <div class="common-card">
             <h3>订单状态</h3>
@@ -100,6 +101,7 @@
           <el-table-column label="生产来源" prop="source" />
           <el-table-column label="注册证号" prop="approveNo" />
           <el-table-column label="生产企业" prop="factory" />
+          <el-table-column label="单价" prop="purcPric" />
           <el-table-column label="需求数量" prop="purcCnt" />
           <el-table-column label="已出库数量" prop="delvCntYck" width="90px" />
           <el-table-column label="剩余出库量" prop="toDelvCnt" width="90px" />
@@ -264,8 +266,8 @@
           v-if="listForm.stas === '部分出库'"
           >出库</el-button
         >
-        <!-- <el-button type="success" @click="handleSave" :loading="saveLoad">保存</el-button> -->
-        <!-- <el-button type="danger" @click="handleOrderEnd" :loading="endLoad">结束订单</el-button> -->
+        <el-button type="danger" @click="handleOrderEnd" v-show="endBtn" :loading="endLoad">结束订单</el-button>
+        <el-button type="success" @click="handleBack" >返回</el-button>
       </div>
     </div>
 
@@ -375,16 +377,16 @@
         <table cellspacing="0" cellpadding="0" border="1" width="100%" class="chuTable">
           <tr height="50px">
             <th :colspan="12" :rowspan="1" style="font-size: 26px; font-weight: 800">
-              出库单
+              送货单
             </th>
-            <th :colspan="7" :rowspan="1" style="font-size: 20px">
+            <th :colspan="8" :rowspan="1" style="font-size: 20px">
               NO:<span style="color: red">{{ listForm.id }}</span>
             </th>
           </tr>
           <tr class="hang">
-            <th :colspan="2">采购方：</th>
+            <th :colspan="2">医院名称：</th>
             <th :colspan="8">
-              {{ listForm.orgName }}
+              {{ listForm.branchName }}
             </th>
             <!-- <th>
                             制单人：
@@ -393,7 +395,7 @@
                             {{ listForm.docmker }}
                         </th> -->
             <th :colspan="2">制单时间：</th>
-            <th :colspan="7">
+            <th :colspan="8">
               {{ listForm.docmkDate }}
             </th>
           </tr>
@@ -403,7 +405,7 @@
               {{ $store.state.user.username }}
             </th>
             <th :colspan="2">出库日期：</th>
-            <th :colspan="7">
+            <th :colspan="8">
               {{ listForm.OutboundDate }}
             </th>
           </tr>
@@ -420,6 +422,7 @@
             <th>生产来源</th>
             <th>注册证号</th>
             <th>生产企业</th>
+            <th>单价</th>
             <th>需求数量</th>
             <th>已出库数量</th>
             <th>剩余出库量</th>
@@ -467,6 +470,9 @@
               {{ item.factory }}
             </td>
             <td align="center">
+              {{ item.purcPric }}
+            </td>
+            <td align="center">
               {{ item.purcCnt }}
             </td> 
             <td align="center">
@@ -489,33 +495,28 @@
             </td>
           </tr>
           <tr class="hang">
-            <th align="center" :colspan="3" >合计</th>
-            <td :colspan="10" align="center">
+            <th align="left" :colspan="6" >合计</th>
+            <td :colspan="14" align="left">
               {{ moneySum | toChineseAmount }}
             </td>
-            <td align="center">
+            <!-- <td align="center"> -->
               <!-- {{ numSum }} -->
-            </td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
+            <!-- </td> -->
           </tr>
           <tr class="hang">
-            <th :colspan="6" align="left">实收金额（人民币）大写：</th>
-            <td :colspan="13">
+            <th :colspan="6" align="left">发货金额（人民币）大写：</th>
+            <td :colspan="14">
               {{ moneySum | toChineseAmount }}
             </td>
           </tr>
           <tr height="50px">
             <th :colspan="6" align="left">备注：</th>
-            <td :colspan="13"></td>
+            <td :colspan="14"></td>
           </tr>
-          <tr class="hang">
+          <!-- <tr class="hang">
             <th align="left" :colspan="6">收货人：</th>
             <td :colspan="13"></td>
-          </tr>
+          </tr> -->
         </table>
       </div>
       <div class="foot-button" style="margin-top: 40px">
@@ -537,7 +538,7 @@ import moment from "moment";
 import {
   getMcsOrdDckDetl,
   saveDelvOrd,
-  submitDelvOrd,
+  finishMcsDelvOrd,
   finishDelvOrd,
   getBillPage,
   submitMcsDelvOrd,
@@ -630,10 +631,12 @@ export default {
       },
       fileIndex:null,
       fileIndex1:null,
+      endBtn:false,
     };
   },
   created() {
     this.listForm.id = this.$route.query.id;
+    // this.listForm.materialId = this.$route.query.materialId;
     this.listForm.detlCnt = this.$route.query.detlCnt;
     this.listForm.qtySum = this.$route.query.qtySum;
     this.listForm.purcAmt = this.$route.query.purcAmt;
@@ -643,7 +646,9 @@ export default {
     this.listForm.OutboundDate = moment(new Date()).format("YYYY-MM-DD HH:mm:ss");
     this.listForm.branchName = this.$route.query.branchName;
     this.listForm.deptName = this.$route.query.deptName;
-    
+    if(this.listForm.stas=='部分出库'){
+      this.endBtn = true
+    }
     // this.stasOptions.forEach((i)=>{
     //     if(i.value == this.$route.query.stas){
     //         this.listForm.stas = i.lable
@@ -787,7 +792,7 @@ export default {
     numAll(row) {
       let num = 0;
       this.tableData.forEach((item) => {
-        if (item.id == row.id) {
+        if (item.materialId == row.materialId) {
           num += item.delvCnt;
         }
       });
@@ -833,7 +838,7 @@ export default {
       this.tableData.forEach(async (item) => {
         await this.numAll(row);
         console.log(this.numAll(row), "he");
-        if (item.id == row.id) {
+        if (item.materialId == row.materialId) {
           if (this.numAll(row) > item.toDelvCnt) {
             this.$message.warning("出库数量不能大于待出库数量");
             row.delvCnt = 0;
@@ -1209,43 +1214,53 @@ export default {
     },
     // 结束订单
     handleOrderEnd() {
-      console.log(this.tableData, "tanleData");
-      this.tableData.forEach((item) => {
-        if (!item.invoFileId || !item.dyntFileId) {
-          this.$message({
-            message: "请填写相应信息，并选择发票和同行单",
-            type: "warning",
-          });
-          throw new Error("请填写相应信息，并选择发票和同行单");
-        }
-      });
-      this.$refs.tabledata.validate((valid) => {
-        if (valid) {
+      // console.log(this.tableData, "tanleData");
+      // this.tableData.forEach((item) => {
+      //   if (!item.invoFileId || !item.dyntFileId) {
+      //     this.$message({
+      //       message: "请填写相应信息，并选择发票和同行单",
+      //       type: "warning",
+      //     });
+      //     throw new Error("请填写相应信息，并选择发票和同行单");
+      //   }
+      // });
+      // this.$refs.tabledata.validate((valid) => {
+        // if (valid) {
           this.$confirm("确认结束订单", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning",
           }).then(() => {
             let data = {
-              delvOrdId: "",
+              delvOrdId: this.$route.query.id,
             };
             this.endLoad = true;
-            submitDelvOrd(data)
+            finishMcsDelvOrd(data)
               .then((res) => {
                 this.endLoad = false;
+                this.$router.push({
+                  name: "purOrderDelivery",
+                });
               })
               .catch((err) => {
                 this.endLoad = false;
               });
           });
-        } else {
-          this.$message({
-            type: "warning",
-            message: "请填写必填项信息",
-          });
-        }
-      });
+        // } else {
+          // this.$message({
+            // type: "warning",
+            // message: "请填写必填项信息",
+          // });
+        // }
+      // });
     },
+
+    // 返回
+    handleBack(){
+      this.$router.push({
+        name: "purOrderDelivery",
+      });
+    }
   },
 };
 </script>

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

@@ -171,7 +171,7 @@
               <span v-if="row.delvOrdStas == 'R'">被驳回</span>
               <span v-if="row.delvOrdStas == 'C'">已出库</span>
               <span v-if="row.delvOrdStas == 'D'">部分出库</span>
-              <span v-if="row.delvOrdStas == 'Y'">已入库</span>
+              <span v-if="row.delvOrdStas == 'Y'">结束订单</span>
               <span v-if="row.delvOrdStas == 'P'">部分入库</span>
             </template>
           </el-table-column>

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.30:8505`,
+        target: `http://192.168.0.50:8505`,
         // target: `http://192.168.0.56:8502`,
         // target: `http://192.168.0.248:6000`,
         //target: `http://api.szlcloud.com/admin`,