From 41662ebf7e7d0ae3a0838374802f4fb6cb2a47ca Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 13 Jun 2024 13:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/partInformation.vue    | 10 +++----
 .../material/com_issureSo_add_or_update.vue   |  3 +-
 .../com_poReceiving_add_or_update.vue         | 29 +++++++++++++++----
 .../com_productionStock_add_or_update.vue     | 17 +++++++----
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/base/partInformation.vue b/src/views/modules/base/partInformation.vue
index d588e5e..cccda1d 100644
--- a/src/views/modules/base/partInformation.vue
+++ b/src/views/modules/base/partInformation.vue
@@ -3547,10 +3547,10 @@
               typeDesignation: '',
               hazardCode: '',
               hazardDesc: '',
-              assetClass: 'S',
-              assetClassDesc: '标准',
+              assetClass: '',
+              assetClassDesc: '',
               dimQuality: '',
-              abcClass: 'C',
+              abcClass: '',
               abcClassDesc: '',
               frequencyClass: 'Very Slow Mover',
               lifecycleStage: 'Development',
@@ -3567,8 +3567,8 @@
               intrastatConvFactor: '',
               umDesc: '',
               status: 'N',
-              partStatus: 'A',
-              partStatusDesc: '活动',
+              partStatus: '',
+              partStatusDesc: '',
               configurationId: '*',
               estimatedMaterialCost: 0,
               inventoryValuationMethod: 'Standard Cost',
diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue
index eb0619d..1ce3a61 100644
--- a/src/views/modules/material/com_issureSo_add_or_update.vue
+++ b/src/views/modules/material/com_issureSo_add_or_update.vue
@@ -362,6 +362,7 @@
     methods: {
       // 获取基础数据列表S
       getBaseList (val, type) {
+        let conSql=''
         this.tagNo = val
         this.tagNo1 = type
         this.$nextTick(() => {
@@ -372,7 +373,7 @@
             }
           }
 
-          this.$refs.baseList.init(val, strVal)
+          this.$refs.baseList.init(val, strVal,conSql)
         })
       },
       /* 列表方法的回调 */
diff --git a/src/views/modules/material/com_poReceiving_add_or_update.vue b/src/views/modules/material/com_poReceiving_add_or_update.vue
index 3337231..cdbfa40 100644
--- a/src/views/modules/material/com_poReceiving_add_or_update.vue
+++ b/src/views/modules/material/com_poReceiving_add_or_update.vue
@@ -71,10 +71,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="库位">
-              <el-select v-model="dataForm.locationId"   style="width: 100%;">
-                <el-option :value="i.locationId" :label="i.locationName" v-for="i in locationList" :key="i.locationId"></el-option>
-              </el-select>
+            <el-form-item >
+              <span slot="label" style="" @click="getBaseList(117,1)" ><a herf="#">库位</a></span>
+              <el-input v-model="dataForm.locationId"  ></el-input>
+<!--              <el-select v-model="dataForm.locationId"   style="width: 100%;">-->
+<!--                <el-option :value="i.locationId" :label="i.locationName" v-for="i in locationList" :key="i.locationId"></el-option>-->
+<!--              </el-select>-->
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -523,10 +525,20 @@
     },
     created () {
 
+    },
+    watch: {
+      dataForm: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.dataForm.wdrNo = this.dataForm.wdrNo.toUpperCase()
+          this.dataForm.batchNo = this.dataForm.batchNo.toUpperCase()
+        }
+      }
     },
     methods: {
       // 获取基础数据列表S
       getBaseList (val, type) {
+        let sql=''
         this.tagNo = val
         this.tagNo1 = type
         this.$nextTick(() => {
@@ -536,8 +548,13 @@
               strVal = this.dataForm.partNo
             }
           }
-
-          this.$refs.baseList.init(val, strVal)
+          if (val === 117) {
+            if(type==1) {
+              strVal = this.dataForm.partNo
+              sql= " and warehouse_id = '"+this.dataForm.warehouseID+"' "
+            }
+          }
+          this.$refs.baseList.init(val, strVal,sql)
         })
       },
       /* 列表方法的回调 */
diff --git a/src/views/modules/material/com_productionStock_add_or_update.vue b/src/views/modules/material/com_productionStock_add_or_update.vue
index f943b91..42ea255 100644
--- a/src/views/modules/material/com_productionStock_add_or_update.vue
+++ b/src/views/modules/material/com_productionStock_add_or_update.vue
@@ -61,10 +61,9 @@
 
         <el-row :gutter="25">
           <el-col :span="6">
-            <el-form-item label="库位">
-              <el-select v-model="dataForm.locationId"   style="width: 100%;">
-                <el-option :value="i.locationId" :label="i.locationName" v-for="i in locationList" :key="i.locationId"></el-option>
-              </el-select>
+            <el-form-item >
+              <span slot="label" style="" @click="getBaseList(117,1)" ><a herf="#">库位</a></span>
+              <el-input v-model="dataForm.locationId"  ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -371,6 +370,7 @@
     methods: {
       // 获取基础数据列表S
       getBaseList (val, type) {
+        let sql=''
         this.tagNo = val
         this.tagNo1 = type
         this.$nextTick(() => {
@@ -380,8 +380,13 @@
               strVal = this.dataForm.partNo
             }
           }
-
-          this.$refs.baseList.init(val, strVal)
+          if (val === 117) {
+            if(type==1) {
+              strVal = this.dataForm.partNo
+              sql= " and warehouse_id = '"+this.dataForm.warehouseID+"' "
+            }
+          }
+          this.$refs.baseList.init(val, strVal,sql)
         })
       },
       /* 列表方法的回调 */