From 4399e5a71d83ea14ef0dd5f8b504a22493d54aa6 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 6 Nov 2023 11:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=A4=87=E6=B3=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  6 +--
 src/views/inout/receive/receiveAdd.vue        | 15 ++++----
 src/views/inout/receive/receiveAudit.vue      |  1 +
 .../inout/receive/receiveAuditDetail.vue      | 37 +++++++++++--------
 src/views/inout/receive/receiveMySearch.vue   |  3 ++
 src/views/inout/receive/receiveSearch.vue     |  2 +
 6 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.env.production b/.env.production
index 63b005d4..3ca504ef 100644
--- a/.env.production
+++ b/.env.production
@@ -9,14 +9,14 @@ ENV = 'production'
 
 #林纪裕cd
 # VUE_APP_BASE_API = 'http://www.linjiyu.lol:81/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
@@ -27,7 +27,7 @@ VUE_APP_BASE_API = 'http://www.linjiyu.lol:83/UDI_WMS_MC/'
 # 平和县医院
 # VUE_APP_BASE_API = 'http://192.168.0.43:9150/UDI_WMS_MC/'
 
-VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index dabd0ec9..b753ba4c 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -92,21 +92,22 @@
                 @current-change="handleDetail"
                 :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="领用单号" prop="billNo"></el-table-column>
-        <el-table-column label="领用部门" prop="deptName"></el-table-column>
-        <el-table-column label="领用仓库" prop="invName"></el-table-column>
-        <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="单据状态" prop="status">
+        <el-table-column label="领用单号" prop="billNo" width="140"></el-table-column>
+        <el-table-column label="领用部门" prop="deptName" width="100"></el-table-column>
+        <el-table-column label="领用仓库" prop="invName" width="100"></el-table-column>
+        <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"  width="180"></el-table-column>
+        <el-table-column label="单据状态" prop="status"  width="120">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status)">
               {{ statusMap[scope.row.status] }}
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip="true"  width="160"></el-table-column>
         <el-table-column label="创建时间" prop="createTime"
-                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+                         sortable="custom" :sort-orders="['ascending', 'descending']"  width="160"></el-table-column>
         <!--        <el-table-column label="领用类型" prop="billType"></el-table-column>-->
-        <el-table-column label="操作">
+        <el-table-column label="操作"  width="160"  fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" :disabled="scope.row.status==3  "
                        @click.native="newDistributionForm(scope.$index, scope.row)">编辑
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 3b5f8d88..52edc63f 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -96,6 +96,7 @@
         <el-table-column label="领用单号" prop="billNo"></el-table-column>
         <el-table-column label="领用部门" prop="deptName"></el-table-column>
         <el-table-column label="领用仓库" prop="invName"></el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
         <!--<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>-->
         <el-table-column label="单据状态" prop="status">
           <template slot-scope="scope">
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index c63bd0ba..9b9b72f7 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form :model="formData"  ref="dataForm" label-width="100px">
+    <el-form :model="formData" ref="dataForm" label-width="100px">
       <el-row type="flex" justify="end">
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -5px">
           <el-button
@@ -56,6 +56,11 @@
 
         </el-row>
         <el-row :gutter="20">
+          <el-col :span="11">
+            <el-form-item prop="remark" label="领用备注:">
+              <el-input v-model="formData.remark" auto-complete="off" disabled></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="11">
             <el-form-item prop="remark" label="审核说明:">
               <el-input v-model="formData.auditRemark" auto-complete="off"></el-input>
@@ -64,7 +69,8 @@
         </el-row>
       </el-card>
       <el-card>
-        <el-table v-loading="loading" :data="codeArray" style="width: 100%;"  border max-height="300" height="300" ref="multipleTable">
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="300" height="300"
+                  ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
           <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
@@ -120,7 +126,7 @@ export default {
       this.showSearch = !this.showSearch;
     },
     handleDetail() {
-      var  query={};
+      var query = {};
       query.orderIdFk = this.formData.billNo;
       getOrderDetail(query) //查找该单号下的所有条码
         .then((response) => {
@@ -130,28 +136,29 @@ export default {
           this.codeArray = [];
         });
     },
-    saveOrder(val){
-      var data={
-        id:this.formData.id,
-        billNo:this.formData.billNo,
-        status:val,
-        auditRemark:this.formData.auditRemark
+    saveOrder(val) {
+      var data = {
+        id: this.formData.id,
+        billNo: this.formData.billNo,
+        status: val,
+        auditRemark: this.formData.auditRemark
       };
-      getAudit(data).then((res=>{
-        if(res.code==20000){
+      getAudit(data).then((res => {
+        if (res.code == 20000) {
           this.closeDialog();
-        }else{
+        } else {
           this.$message.error(res.message);
         }
       }))
     }
   },
   filters: {},
-  mounted() {},
+  mounted() {
+  },
   created() {
     console.log(this.idQuery)
-     this.formData=this.idQuery;
-     this.handleDetail();
+    this.formData = this.idQuery;
+    this.handleDetail();
   },
 };
 </script>
diff --git a/src/views/inout/receive/receiveMySearch.vue b/src/views/inout/receive/receiveMySearch.vue
index 3c97c6cc..4898d2a3 100644
--- a/src/views/inout/receive/receiveMySearch.vue
+++ b/src/views/inout/receive/receiveMySearch.vue
@@ -110,6 +110,9 @@
         <el-table-column label="领用部门" prop="deptName"></el-table-column>
         <el-table-column label="领用仓库" prop="invName"></el-table-column>
         <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
+
+        <el-table-column label="领用备注" prop="remark"></el-table-column>
+        <el-table-column label="审核说明" prop="auditRemark"></el-table-column>
         <el-table-column label="单据状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="(scope.row.status)">
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index a3fe5800..3c5c73a7 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -122,6 +122,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="领用备注" prop="remark"></el-table-column>
+        <el-table-column label="审核说明" prop="auditRemark"></el-table-column>
         <el-table-column label="创建时间" prop="createTime"
                          sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
         <el-table-column label="审核时间" prop="auditTime"