代码更新

lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue

@@ -57,6 +57,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="point_code" label="仓位编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="point_name" label="仓位名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="sect_name" label="库区" min-width="120" show-overflow-tooltip />
 <!--        <el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />-->
         <el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />

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

@@ -2,6 +2,85 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              placeholder="输入物料编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input
+              v-model="query.material_name"
+              clearable
+              placeholder="输入物料名称"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="订单号">
+            <el-input
+              v-model="query.sale_order_name"
+              clearable
+              placeholder="输入订单号"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="客户编码">
+            <el-input
+              v-model="query.customer_name"
+              clearable
+              placeholder="输入客户编码"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="客户名称">
+            <el-input
+              v-model="query.customer_description"
+              clearable
+              placeholder="输入客户名称"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+<!--          <el-form-item label="满轴位状态">
+            <el-select
+              v-model="query.full_point_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.sch_full_point_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>-->
+          <rrOperation :crud="crud" />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->

lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/taskDtl.vue

@@ -87,6 +87,7 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="bill_code" label="单据编码" :min-width="flexWidth('bill_code',crud.data,'单据编码')" />
+        <el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
         <el-table-column prop="dtl_status" label="明细状态" :min-width="flexWidth('dtl_status',crud.data,'明细状态')" />
         <el-table-column prop="start_point_code" label="起始点位" :min-width="flexWidth('start_point_code',crud.data,'起始点位')" />
         <el-table-column prop="next_point_code" label="终点点位" :min-width="flexWidth('next_point_code',crud.data,'终点点位')" />

lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue

@@ -179,7 +179,7 @@ export default {
       debugger
       // 判断是否可以关闭编辑状态
       if (row.edit === undefined) {
-        row.edit = false
+        this.$set(row, 'edit', false)
       }
       if (!row.edit) {
         if (row.plan_qty > this.queryrow.unassign_qty) {