From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git

---
 src/views/operate/outEnterLibrary/index.vue |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/src/views/operate/outEnterLibrary/index.vue b/src/views/operate/outEnterLibrary/index.vue
index 9eb2e60..950408b 100644
--- a/src/views/operate/outEnterLibrary/index.vue
+++ b/src/views/operate/outEnterLibrary/index.vue
@@ -4,10 +4,11 @@
       <SearchCommonView
         :add-title="'鏂板缓'"
         :showAdd="false"
+        :showDownload="true"
         :placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
         :amount-view="false"
         @addCommonClick="addBtnClick"
-        @searchClick="getList"
+        :inputName="params.keyWord"
       />
     </div>
     <div class="list-view">
@@ -18,7 +19,7 @@
           @selTableCol="selTableCol"
         >
           <template slot="tableButton">
-            <el-table-column label="鎿嶄綔" width="100">
+            <el-table-column label="鎿嶄綔" width="120">
               <template slot-scope="scope">
                 <el-button @click="tableRowClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
                 <el-button
@@ -39,9 +40,11 @@
     </div>
     <!-- 鏌ョ湅/缂栬緫 -->
     <AddOverviewDialog 
+      ref="viewDialog"
       v-if="editConfig.visible" 
       :edit-common-config="editConfig" 
       :add-name="addName"
+      :workType="workType"
     />
   </div>
 </template>
@@ -53,6 +56,7 @@
 
 import AddOverviewDialog from "@/views/overview/AddOverviewDialog"
 import { getDataByType } from "@/api/data"
+
 export default {
   name: "InboundOutboundDetail",
   props: {},
@@ -77,11 +81,11 @@
       },
       params: {},
       baseOperationTypeList:getDataByType("baseOperationTypeTwo"),
+      workType:-1
     }
   },
   created() {
     this.setTable()
-    console.log(this.$route.params)
     var paramsList = sessionStorage.getItem("paramsList")
     let params = {}
     if (paramsList) {
@@ -91,7 +95,7 @@
       sessionStorage.setItem("paramsList", JSON.stringify(params))
     }
     this.params = params
-    console.log(this.params,'====111')
+    console.log(this.params,'璺敱鍙傛暟')
     this.getData()
   },
   // 椤甸潰閿�姣佷箣鍓�
@@ -145,11 +149,11 @@
         },
         {
           label: "涓氬姟绫诲瀷",
-          prop: "baseOperationType",
+          prop: "operationTypeName",
           isShowColumn: true,
           default: true,
-          conversion: true,
-          getStatus: this.getBaseOperationTypeList
+          // conversion: true,
+          // getStatus: this.getBaseOperationTypeList
         },
         {
           label: "浠�",
@@ -219,6 +223,7 @@
     async getData() {
       if (this.params.name === "鎶ヨ〃") {
         await listByCondition({
+          // condition:"",
           keyWord:this.params.keyWord,
           produceId:this.params.produceId,
           unit:this.params.unit,
@@ -268,9 +273,41 @@
       this.getData()
     },
     tableRowClick(row,val) {
+      this.workType=row.baseOperationType
       this.editConfig.title = val
       getOperationInfo(row.operationId).then((res)=>{
-        this.editConfig.infomation = { ...res.data }
+        let params=JSON.parse(
+                  JSON.stringify(res.data)
+                );
+                params.details.map((item) => {
+          item.fromLocationId = item.fromLocation.jointName
+          item.toLocationId = item.toLocation.jointName
+        })
+        params.location = {
+          value:params.location.id || params.location.value,
+          label: params.location.jointName || params.location.label
+        }
+        params.toLocation = {
+          value: params.toLocation.id || params.toLocation.value,
+          label: params.toLocation.jointName || params.toLocation.label
+        }
+        params.locationID = params.location.jointName
+        params.locationId =params.location.value
+        params.managerObj={
+          label:params.manager,
+          value:params.managerId
+        }
+        params.accountantObj={
+          label:params.accountant,
+          value:params.accountantId
+        }
+        params.custodianObj={
+          label:params.custodian,
+          value:params.custodianId
+        }
+        this.editConfig.infomation = { 
+          ...params
+        }
         this.editConfig.visible = true
       })
       // this.editConfig.visible = true
@@ -285,7 +322,7 @@
     getStatus(val) {
       let newVal=Number(val)
       return newVal === 1 ? "鑽夌" : newVal === 3 ? "灏辩华" : newVal=== 4 ?"瀹屾垚":newVal=== 5 ?"宸插彇娑�":" "
-    }
+    },
   }
 }
 </script>

--
Gitblit v1.8.0