Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue

@@ -59,22 +59,8 @@
         placeholder="请输入子卷号"
         class="search-input"
         clearable
-        @clear="handleInput"
-        @input="handleSearch"
+        @clear="clearSearch"
       />
-
-      <span class="crud-opts-right2">
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="success"
-          icon="el-icon-circle-close"
-          size="mini"
-          @click="clearSearch()"
-        >
-          清空
-        </el-button>
-      </span>
       <span class="crud-opts-right2" style="margin-left: 15px;">
         <el-button
           slot="left"
@@ -228,11 +214,12 @@ export default {
       })
       console.log('multipleSelection2:', this.multipleSelection)
       const table2 = this.$refs.dis_table
-      table2.clearSelection()
-      const selectedRows = this.multipleSelection
-      selectedRows.forEach(row => {
-        debugger
-        table2.toggleRowSelection(row)
+      this.$nextTick(() => {
+        table2.clearSelection()
+        const selectedRows = this.multipleSelection
+        selectedRows.forEach(row => {
+          table2.toggleRowSelection(row)
+        })
       })
       // this.$refs.dis_table.clearSelection()
       // this.multipleSelection.forEach(row => {
@@ -270,7 +257,6 @@ export default {
     },
     getMultipleSelection(multipleSelection) {
       return multipleSelection.reduce((acc, item) => {
-        debugger
         const existingItem = acc.find(existing => existing.container_name === item.container_name)
         if (!existingItem) {
           acc.push(item)
@@ -296,7 +282,7 @@ export default {
     },
     // 表格1的行点击事件
     handleRowClick(scope) {
-      debugger
+      this.clearSelection()
       const table2 = this.$refs.dis_table
       const table2Data = Array.from(this.openParam)
       const groupValue = scope.box_group === 0 ? scope.container_name : scope.box_group
@@ -327,24 +313,24 @@ export default {
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex
     },
-    tableChanged(row) {
+    async tableChanged(row) {
       this.form.tableMater = this.currentSelection
       this.form.checked = row.material_code
+      // 父组件传过来的订单号
       this.form.sale_order_name = this.sale_order_name
-      crudPackagerelation.updateEntityList(this.form).then(res => {
-        crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.sale_order_name }).then(res => {
-          this.openParam = res.content
-          this.$emit('childEvent')
-          this.clearSelection()
-        })
-        this.form.tableMater = []
+      try {
+        await crudPackagerelation.updateEntityList(this.form)
+        const res = await crudSubpackagerelation.queryContainerization({ 'sale_order_name': this.sale_order_name })
+        this.openParam = res.content
+        this.clearSelection()
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      })
+      } catch (error) {
+        console.error('更新数据出错：', error)
+        this.crud.notify('更新数据出错', CRUD.NOTIFICATION_TYPE.ERROR)
+      }
     },
     divStruct() {
-      debugger
       if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) {
-        debugger
         this.structShow = true
         this.$refs.child.getMsg(false)
       } else {
@@ -378,7 +364,7 @@ export default {
 }
 
 .search-input {
-  width: 200px;
+  width: 251px;
 }
 
 .clear-icon {

lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue

@@ -63,9 +63,9 @@ export default {
     return CRUD({
       title: '木箱规格',
       optShow: {},
-      url: 'api/Materialbase',
-      idField: 'material_id',
-      sort: 'material_id,desc',
+      url: 'api/boxinfo',
+      idField: 'material_code',
+      sort: 'material_code,desc',
       query: { search: '', material_id: '' },
       crudMethod: { ...crudMaterattr }
     })
@@ -168,7 +168,6 @@ export default {
       this.$emit('update:dialogShow', false)
     },
     submit() {
-      debugger
       this.rows = this.$refs.table.selection
       if (this.rows.length <= 0) {
         this.$message('请先选择木箱信息')

lms/nladmin-ui/src/views/wms/pdm/sub/index.vue

@@ -158,8 +158,7 @@ const defaultForm = {
   mass_per_unit_area: null,
   net_weight: null,
   length: null,
-  date_of_production: null,
-  is_un_plan_production: null,
+  date_of_production: null, is_un_plan_production: null,
   un_plan_product_property1: null,
   un_plan_product_property2: null,
   un_plan_product_property3: null,
@@ -279,7 +278,6 @@ export default {
       if (this.currentRow !== null) {
         crud.downloadLoading = true
         download('/api/packagerelation/download', this.crud.query).then(result => {
-          debugger
           downloadFile(result, '子卷包装', 'xlsx')
           crud.downloadLoading = false
         }).catch(() => {