From 8a9a88437464258460691770f3c66e8ac2684b32 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 29 Nov 2023 12:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E9=85=8D=E8=B4=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                           |   4 +-
 src/api/inout/order.js                    |  10 +++
 src/views/inout/DialogCreateOrder.vue     |   7 +-
 src/views/inout/IoReturnedSearchOrder.vue | 104 +++++++++++++++++-----
 4 files changed, 100 insertions(+), 25 deletions(-)

diff --git a/.env.production b/.env.production
index c5bb385..5e56bff 100644
--- a/.env.production
+++ b/.env.production
@@ -22,10 +22,10 @@ ENV = 'production'
 
 # 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
 
 # 漳州中医院
-VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
 
 # 平和
 # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 34e015e..f4154c9 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -537,3 +537,13 @@ export function orderDetailAdd(params) {
     data: params
   });
 }
+
+
+export function copyOrder(params) {
+  return axios({
+    url: "/udiwms/inout/order/copyOrder",
+    method: "post",
+    data: params
+  });
+}
+
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 05c6e55..eaa5869 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -74,7 +74,7 @@
           <el-col :span="11">
             <el-form-item prop="action" label="单据类型:">
               <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
-                         :disabled="corpOrderIdDisabled"
+                         :disabled="corpOrderIdDisabled && orderFormData.action!=null"
                          style="width: 90%"
                          @change="actionChange">
                 <el-option
@@ -957,7 +957,10 @@ export default {
       this.refreshCodesPanel();
       // //加载选择框候选数据
       this.findInvListByUser();
-      this.initBusType();
+      if (this.orderFormData.action == null) {
+        this.getBusTypeByInv();
+      } else
+        this.initBusType();
 
       this.findMethod(this.orderFormData.fromCorp);
       this.findFromInvList();
diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue
index 011c7fc..415e396 100644
--- a/src/views/inout/IoReturnedSearchOrder.vue
+++ b/src/views/inout/IoReturnedSearchOrder.vue
@@ -141,7 +141,7 @@
                 border
                 @current-change="handleSelectionChange"
                 :default-sort="defaultSort"
-                @sort-change="handleSortChange"     >
+                @sort-change="handleSortChange">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -158,7 +158,7 @@
 
         <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
                          sortable="custom"
-                         :sort-orders="['ascending', 'descending']"       >
+                         :sort-orders="['ascending', 'descending']">
           <template slot-scope="scope">
             <i class="el-icon-time"></i>
             <span>{{ scope.row.createTime }}</span>
@@ -195,22 +195,30 @@
             >打印
             </el-button
             >
+
             <el-button
               type="text"
               size="small"
-              v-if="customerId == 110"
-              @click.native.stop="rollback(scope.row)"
-            >撤回
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.row.status == 10"
-              @click.native.stop="reviewOrder(scope.row)"
-            >审核
+              @click.native.stop="repeatOrder(scope.row)"
+            >再次配货
             </el-button
             >
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="customerId == 110"-->
+            <!--              @click.native.stop="rollback(scope.row)"-->
+            <!--            >撤回-->
+            <!--            </el-button-->
+            <!--            >-->
+            <!--            <el-button-->
+            <!--              type="text"-->
+            <!--              size="small"-->
+            <!--              v-if="scope.row.status == 10"-->
+            <!--              @click.native.stop="reviewOrder(scope.row)"-->
+            <!--            >审核-->
+            <!--            </el-button-->
+            <!--            >-->
             <el-button
               type="text"
               size="small"
@@ -510,11 +518,30 @@
       ></accept-order>
     </el-dialog>
 
+
+    <el-dialog
+      title="编辑单据"
+      :visible.sync="addOrderVisible"
+      width="85%"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="addOrderVisible"
+      @close='closeDialog'
+    >
+      <addOrder
+        :closeDialog="closeDialog"
+        :orderQuery="returnData"
+        :viewType="viewType"
+      ></addOrder>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import {
+  copyOrder,
   deleteByOrderId,
   getOrderList, rollUnReceivebackOrder
 } from "../../api/inout/order";
@@ -529,6 +556,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 
+import addOrder from "./DialogCreateOrder";
 
 const formJson = {
   site_id: "",
@@ -548,14 +576,14 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "supSearch",
+        vueType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
         startAduditTime: null,
         endAduditTime: null,
-        status: 10,
+        // status: 10,
         invCode: this.$store.getters.locInvCode,
       },
 
@@ -593,7 +621,7 @@ export default {
         "11": "仓库盘点",
         "12": "采购计划",
         "13": "领用单据",
-        "14": "第三方系统单据","15":"采购订单"
+        "14": "第三方系统单据", "15": "采购订单"
       },
       deleteData: {
         id: "",
@@ -670,9 +698,14 @@ export default {
       acceptQuery: null,
       acceptOrderVisible: false,
       showSup: false,
+
+
+      addOrderVisible: false,
+      returnData: null,
+      viewType: 3,
     };
   },
-  components: {AcceptOrder},
+  components: {AcceptOrder, addOrder},
   methods: {
     onReset() {
       this.$router.push({
@@ -683,15 +716,15 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "supSearch",
+        vueType: "supReturned",
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
-      this.actDateRange=[];
-      this.auditDateRange=[];
+      this.actDateRange = [];
+      this.auditDateRange = [];
       this.getList();
     },
 
@@ -775,6 +808,30 @@ export default {
         this.loading = false;
       });
     },
+
+
+    repeatOrder(row) {
+      this.$confirm('此操作将创建新的送货单据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+
+        copyOrder(row)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.returnData = response.data;
+              this.addOrderVisible = true;
+            }
+
+          })
+          .catch(() => {
+          });
+
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
+    },
     getBusType() {
       let query = {
         // code: this.filterQuery.invCode,
@@ -831,7 +888,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
-      this.filterQuery.busType = 4;     //退货出入库单据类型
+      // this.filterQuery.busType = 4;     //退货出入库单据类型
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -1047,6 +1104,11 @@ export default {
       };
       return statusMap[status];
     },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+    },
+
   }
   ,
   mounted() {