From 7fbe0f95cf428eb516f9015adae8bbe4baf539d4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 11:01:15 +0800
Subject: [PATCH] 安灯管理列表筛选条件修改

---
 src/views/tms/modules/inbound/InboundModel.vue |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/tms/modules/inbound/InboundModel.vue b/src/views/tms/modules/inbound/InboundModel.vue
index bbd4993..55980de 100644
--- a/src/views/tms/modules/inbound/InboundModel.vue
+++ b/src/views/tms/modules/inbound/InboundModel.vue
@@ -47,7 +47,7 @@
           </a-col>
         </a-row>
 
-        <a-row style="width: 100%">
+        <!-- <a-row style="width: 100%">
           <a-col :span="24 / 2">
             <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="搴撲綅鍙�" prop="locationCodeId">
               <a-select
@@ -57,7 +57,7 @@
               />
             </a-form-model-item>
           </a-col>
-        </a-row>
+        </a-row> -->
       </a-form-model>
     </a-spin>
     <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">閫夋嫨鍊熷嚭宸ュ叿</a-button>
@@ -78,7 +78,7 @@
         <div :key="col.dataIndex">
           <a-input-number
             v-if="col.dataIndex == 'inStorageQuantity'"
-            :disabled="record.accuracyClass == '1'"
+            
             :value="text"
             @change="(e) => handleChange(e, record, col, index)"
             :min="1"
@@ -105,8 +105,9 @@
   
     <div id="printArea" style="display: block;">
       <div v-for="(item, index) in qrList" :key="index" class="qrcode-item">
+        <p>{{ item.onlyCode }}</p>
+        <p>{{ item.toolName }}</p>
         <img :src="item.base64" alt="QR Code">
-        <p>{{ item.content }}</p>
       </div>
     </div>
   </a-modal>
@@ -248,6 +249,12 @@
           width: 150,
         },
         {
+          title: '搴撲綅鍙�',
+          align: 'center',
+          dataIndex: 'goodsShelvesId',
+          width: 150,
+        },
+        {
           title: '鍏ュ簱鏁伴噺',
           align: 'center',
           dataIndex: 'inStorageQuantity',
@@ -283,6 +290,7 @@
       return filterObj(this.param)
     },
     add (nodeSelected) {
+      this.qrList = []
       this.classifyId = nodeSelected.key
       this.model.classifyNum =  nodeSelected.entity.classifyId
       this.model.typeName =  nodeSelected.entity.typeName
@@ -325,19 +333,23 @@
     },
     handleOk() {
       const that = this
+      if(this.dataSource.length == 0){
+        that.$message.error("璇峰厛閫夋嫨闇�瑕佸叆搴撶殑宸ュ叿!")
+        return
+      }
       // 瑙﹀彂琛ㄥ崟楠岃瘉
-      this.form.validateFields((err, values) => {
-        if (!err) {
+      this.$refs.form.validate(valid => {
+        if (valid) {
           that.confirmLoading = true
-          let formData = Object.assign(this.model, values)
-          formData.detailData = this.dataSource
-          formData.classifyId = this.classifyId
-          postAction(this.url.addInStorage, formData)
+          this.model.detailData = this.dataSource
+          this.model.classifyId = this.classifyId
+          postAction(this.url.addInStorage, this.model)
             .then((res) => {
               if (res.success) {
-                if(formData.inStorehouseType === '1'){
+                if(this.model.inStorehouseType === '1'){
                   this.qrList = res.result.map((content, i) => ({
-                  content:res.result[i].content,
+                  onlyCode:res.result[i].onlyCode,
+                  toolName:res.result[i].toolName,
                   base64: res.result[i].image
                   }));
                   this.handleBacthPrint();
@@ -465,7 +477,8 @@
           onlyCode:data[i].onlyCode,
           inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
           quantity:data[i].quantity,
-          accuracyClass:data[i].accuracyClass
+          accuracyClass:data[i].accuracyClass,
+          goodsShelvesId:data[i].positionCode
         })
       }
       //this.ipaginationm.total = this.dataSource.length

--
Gitblit v1.9.3