Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/basic/workplace/addWorkplaceFreightDialog.vue

@@ -17,7 +17,7 @@
           <el-form-item label="货架说明:" class="query-form-item">
             <el-input
               :disabled="remarkStatus"
-              v-model="formData.remark" style="width: 80%"
+              v-model="formData.name" style="width: 80%"
               auto-complete="off"
               placeholder="请输入货架名称"
             ></el-input>
@@ -190,7 +190,7 @@ export default {
       formData: {
         code: '',
         name: '',
-        remark: '',
+        remark: null,
         workPlaceIdFk: '',
         freightRow: null,
         isSingQueue: 1
@@ -343,8 +343,9 @@ export default {
       }
       row.freightCode = this.formData.code
       row.workPlaceIdFk = this.formData.workPlaceIdFk
-      row.remark = this.formData.remark
+      row.name = this.formData.name
       row.isSingQueue = this.formData.isSingQueue
+      row.freightRow = this.formData.freightRow
       this.remarkStatus = true
       saveLayer(row).then(res => {
         if (res.code == 20000){

src/views/basic/workplace/editWorkPlaceQueueDialog.vue

@@ -265,6 +265,7 @@ export default {
         mac:"",
         isBind: 0,
       },
+      ledList:[]
     }
   },
   methods: {

src/views/basic/workplace/freightManage.vue

@@ -34,7 +34,7 @@
             >
             </el-table-column>
             <el-table-column
-              prop="remark"
+              prop="name"
               label="取货架说明"
             >
             </el-table-column>
@@ -272,7 +272,8 @@ export default {
         page: 1,
         limit: 5,
         workPlaceIdFk: '',
-        key: ''
+        key: '',
+        code: null,
         // code: null,
         // workplaceStatus: 1,
         // workPlaceClass: 2,
@@ -300,6 +301,8 @@ export default {
       queueTotal: 0,
       WorkplaceFreightDialogVisible: false,
       WorkplaceQueueDialogVisible: false,
+      freightCode: null,
+      layerCode: null,
     }
   },
   methods: {
@@ -368,10 +371,14 @@ export default {
     },
     handChangeFreight(row) {
       this.LayerQuery.freightCode = row.code
+      this.freightCode = row.code
+      this.queueQuery.layerCode = null
+      this.layerCode = null
       this.getLayers()
     },
     handChangeLayer(row) {
       this.queueQuery.layerCode = row.code
+      this.layerCode = row.code
       this.getQueues()
     },
     handleEdit(row) {
@@ -464,9 +471,7 @@ export default {
       }).then(() => {
         deleteQueue(row).then(res => {
           if (res.code == 20000){
-            this.getList()
+            this.getFreightList()
-            this.getLayers()
-            this.getQueues()
             this.$message.success("删除成功")
           }else {
             this.$message.error("删除失败")
@@ -491,7 +496,7 @@ export default {
       }).then(() => {
         deleteLayer(query).then(res => {
           if (res.code == 20000){
-            this.getList()
+            this.getFreightList()
             this.$message.success("删除成功")
           }else {
             this.$message.error(res.message)
@@ -500,8 +505,35 @@ export default {
       }).catch(() => {
 
       })
-
+    },
-
+    getFreightList(){
+      getWorkplaceFreightList(this.query).then(res => {
+        if (res.code == 20000) {
+            this.freightList = res.data.list || []
+            this.total = res.data.total || 0
+            this.LayerQuery.freightCode = this.freightCode
+            this.getLayerList()
+        } else {
+          this.total = 0
+          this.freightList = []
+        }
+      })
+    },
+    getLayerList(){
+      getLayerList(this.LayerQuery).then(res => {
+        if (res.code == 20000) {
+            this.layerList = res.data.list || []
+            this.LayerTotal = res.data.total
+          console.log("shsjhshshs",this.layerCode)
+          if (this.layerCode != null){
+            this.queueQuery.layerCode = this.layerCode
+          }
+            this.getQueues()
+        } else {
+          this.LayerTotal = 0
+          this.layerList = []
+        }
+      })
     }
   },
   created() {

src/views/collect/ioSplitFifoCodeRemindSetDialog.vue

@@ -55,10 +55,10 @@
     </el-form>
 
     <div slot="footer" class="dialog-footer">
-      <el-button @click.native="closeDialog">取消</el-button>
       <el-button type="primary" @click.native="addInvRemindSet()" :loading="formLoading"
       >提交
       </el-button>
+      <el-button @click.native="closeDialog">取消</el-button>
     </div>
   </div>
 </template>
@@ -135,5 +135,11 @@ export default {
 </script>
 
 <style type="text/scss" lang="scss">
+
+.dialog-footer {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
 </style>