文件上传、token过期监控修改、养生区成品区代码修改、easyExcel

2022-10-27 20:31:07 +08:00
parent 113a5186e6
commit 36be12ba96
15 changed files with 712 additions and 164 deletions
--- a/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
+++ b/lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
@@ -20,6 +20,50 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              size="mini"
+              style="width: 185px;"
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="点位状态">
+            <el-select
+              v-model="query.point_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in pointStatusList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="载具类型">
+            <el-select
+              v-model="query.vehicle_type"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
          <el-form-item label="排">
            <el-input
              v-model="query.row_num"
@@ -50,51 +94,6 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
-          <el-form-item label="点位状态">
-            <el-select
-              v-model="query.point_status"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.sch_point_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="query.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="入库时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
          <el-form-item label="锁定类型">
            <el-select
              v-model="query.lock_type"
@@ -112,6 +111,18 @@
              />
            </el-select>
          </el-form-item>
+          <el-form-item label="入库时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
          <el-form-item label="是否启用">
            <el-switch
              v-model="query.is_used"
@@ -138,6 +149,27 @@
        >
          出库
        </el-button>
+        <el-button
+          v-if="showTab"
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-s-promotion"
+          size="mini"
+          @click="changeShowTab">
+          编辑
+        </el-button>
+        <el-button
+          v-if="!showTab"
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-s-promotion"
+          size="mini"
+          :disabled="crud.selections.length === 0"
+          @click="doEdit(crud.data)">
+          保存
+        </el-button>
      </crudOperation>
      <!--表单组件-->
      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
@@ -205,19 +237,73 @@
        <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip/>
        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3"/>
+        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
+          <template slot-scope="scope">
+            <el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
+            <span v-show="showTab">{{scope.row.ivt_qty}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_code" label="物料编码" >
+          <template slot-scope="scope">
+            <el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
+            <span v-show="showTab">{{scope.row.material_code}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_name" label="物料名称" />
        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="point_status_name" label="点位状态" />
-        <el-table-column prop="vehicle_type" label="托盘类型" min-width="100"/>
+        <el-table-column prop="point_status_name" label="点位状态" width="120">
+          <template slot-scope="scope">
+            <el-select
+              v-show="!showTab"
+              v-model="scope.row.point_status"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item in pointStatusList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <span v-show="showTab">{{scope.row.point_status_name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
        <el-table-column prop="remark" label="备注" />
        <el-table-column prop="is_used" label="是否启用" >
          <template slot-scope="scope">
-            {{ scope.row.is_used=='1' ? '是' : '否' }}
+            <el-switch
+              v-show="!showTab"
+              v-model="scope.row.is_used"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"
+            />
+            <span v-show="showTab">{{ scope.row.is_used=='1' ? '是' : '否' }}</span>
          </template>
        </el-table-column>
-        <el-table-column prop="lock_type" label="锁定类型" >
+        <el-table-column prop="lock_type" label="锁定类型" width="120">
          <template slot-scope="scope">
-            {{ dict.label.d_lock_type[scope.row.lock_type] }}
+            <el-select
+              v-model="scope.row.lock_type"
+              v-show="!showTab"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item in dict.d_lock_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <span v-show="showTab">{{ dict.label.d_lock_type[scope.row.lock_type] }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="update_optname" label="修改人" />
@@ -245,11 +331,12 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import crudRegion from '@/api/wms/sch/region'

 const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
  name: 'CppInventory',
-  dicts: ['sch_point_status', 'vehicle_type', 'is_used', 'd_lock_type'],
+  dicts: ['sch_point_status', 'vehicle_type', 'is_used', 'd_lock_type', 'vehicle_type'],
  components: { pagination, crudOperation, rrOperation, udOperation },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
@@ -272,6 +359,8 @@ export default {
  },
  data() {
    return {
+      showTab: true,
+      pointStatusList: [],
      permission: {
      },
      rules: {
@@ -284,6 +373,9 @@ export default {
      }
    }
  },
+  created() {
+    this.getPointStatusList('1557538851726168064')
+  },
  methods: {
    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
    [CRUD.HOOK.beforeRefresh]() {
@@ -298,6 +390,24 @@ export default {
        this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
        this.crud.toQuery()
      })
+    },
+    getPointStatusList(id) {
+      crudRegion.getPointStatusSelectById(id).then(res => {
+        this.pointStatusList = res
+      })
+    },
+    changeShowTab() {
+      this.showTab = !this.showTab
+    },
+    doEdit(datas) {
+      console.log(datas)
+      if (datas.length > 0) {
+        crudStructivt.batchEdit(datas).then(res => {
+          this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+      this.showTab = true
    }
  }
 }
--- a/lms/nladmin-ui/src/views/wms/st/structivt.js
+++ b/lms/nladmin-ui/src/views/wms/st/structivt.js
@@ -32,4 +32,12 @@ export function outInventory(data) {
  })
 }

-export default { add, edit, del, outInventory }
+export function batchEdit(data) {
+  return request({
+    url: 'api/structivt/batchEdit',
+    method: 'post',
+    data: data
+  })
+}
+
+export default { add, edit, del, outInventory, batchEdit }
--- a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
+++ b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
@@ -20,6 +20,50 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              size="mini"
+              style="width: 185px;"
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="点位状态">
+            <el-select
+              v-model="query.point_status"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="querys"
+            >
+              <el-option
+                v-for="item in pointStatusList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="载具类型">
+            <el-select
+              v-model="query.vehicle_type"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              style="width: 185px;"
+              @change="querys"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
          <el-form-item label="块">
            <el-input
              v-model="query.block_num"
@@ -50,35 +94,18 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
-          <el-form-item label="点位状态">
+          <el-form-item label="锁定类型">
            <el-select
-              v-model="query.point_status"
+              v-model="query.lock_type"
              clearable
              filterable
              size="mini"
              class="filter-item"
              style="width: 185px;"
-              @change="hand"
+              @change="querys"
            >
              <el-option
-                v-for="item in dict.sch_point_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="载具类型">
-            <el-select
-              v-model="query.vehicle_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.vehicle_type"
+                v-for="item in dict.d_lock_type"
                :label="item.label"
                :value="item.value"
              />
@@ -95,23 +122,6 @@
              @change="crud.toQuery"
            />
          </el-form-item>
-          <el-form-item label="锁定类型">
-            <el-select
-              v-model="query.lock_type"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-              style="width: 185px;"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.d_lock_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
          <el-form-item label="是否启用">
            <el-switch
              v-model="query.is_used"
@@ -119,14 +129,36 @@
              inactive-value="1"
              active-color="#C0CCDA"
              inactive-color="#409EFF"
-              @change="hand"
+              @change="querys"
            />
          </el-form-item>
          <rrOperation :crud="crud" />
        </el-form>
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission">
+        <el-button
+          v-if="showTab"
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-s-promotion"
+          size="mini"
+          @click="changeShowTab">
+          编辑
+        </el-button>
+        <el-button
+          v-if="!showTab"
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-s-promotion"
+          size="mini"
+          :disabled="crud.selections.length === 0"
+          @click="doEdit(crud.data)">
+          保存
+        </el-button>
+      </crudOperation>
      <!--表单组件-->
      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
@@ -143,7 +175,7 @@
              style="width: 370px;"
            >
              <el-option
-                v-for="item in dict.sch_point_status"
+                v-for="item in pointStatusList"
                :label="item.label"
                :value="item.value"
              />
@@ -196,22 +228,85 @@
        <el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
        <el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="ivt_qty" label="库存数" />
-        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="point_status_name" label="点位状态" />
-        <el-table-column prop="lock_type" label="锁定类型">
+        <el-table-column prop="ivt_qty" label="库存数" min-width="100">
          <template slot-scope="scope">
-            {{ dict.label.d_lock_type[scope.row.lock_type] }}
+            <el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
+            <span v-show="showTab">{{scope.row.ivt_qty}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_code" label="物料编码" >
+          <template slot-scope="scope">
+            <el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
+            <span v-show="showTab">{{scope.row.material_code}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_name" label="物料名称" />
+        <el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
+        <el-table-column prop="point_status" label="点位状态" width="120">
+          <template slot-scope="scope">
+            <el-select
+              v-show="!showTab"
+              v-model="scope.row.point_status"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item in pointStatusList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <span v-show="showTab">{{scope.row.point_status_name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="lock_type" label="锁定类型" width="120">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.lock_type"
+              v-show="!showTab"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item in dict.d_lock_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <span v-show="showTab">{{ dict.label.d_lock_type[scope.row.lock_type] }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="is_used" label="是否启用">
          <template slot-scope="scope">
-            {{ scope.row.is_used=='1' ? '是' : '否' }}
+            <el-switch
+              v-show="!showTab"
+              v-model="scope.row.is_used"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"
+            />
+            <span v-show="showTab">{{ scope.row.is_used=='1' ? '是' : '否' }}</span>
          </template>
        </el-table-column>
-        <el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
+        <el-table-column prop="vehicle_type" label="托盘类型" min-width="150">
          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+            <el-select
+              v-show="!showTab"
+              v-model="scope.row.vehicle_type"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item in dict.vehicle_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+            <span v-show="showTab">{{ dict.label.vehicle_type[scope.row.vehicle_type] }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="vehicle_code" label="托盘号" />
@@ -230,6 +325,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import crudRegion from '@/api/wms/sch/region'

 const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, standing_time: null, block_num: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
@@ -258,6 +354,8 @@ export default {
  },
  data() {
    return {
+      showTab: true,
+      pointStatusList: [],
      permission: {
      },
      rules: {
@@ -270,17 +368,41 @@ export default {
      }
    }
  },
+  created() {
+    this.getPointStatusList('1557539288307077120')
+  },
  methods: {
    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
    [CRUD.HOOK.beforeRefresh]() {
      return true
    },
+    querys() {
+      this.crud.toQuery()
+    },
    hand(value) {
      // 块排列 的参数整合
      if (this.locations.length > 0) {
        this.query.locationsOptions = this.locations[0] + '/' + this.locations[1] + '/' + this.locations[2]
      }
      this.crud.toQuery()
+    },
+    changeShowTab() {
+      this.showTab = !this.showTab
+    },
+    getPointStatusList(id) {
+      crudRegion.getPointStatusSelectById(id).then(res => {
+        this.pointStatusList = res
+      })
+    },
+    doEdit(datas) {
+      console.log(datas)
+      if (datas.length > 0) {
+        crudStructivt.batchEdit(datas).then(res => {
+          this.crud.notify('保存成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.crud.toQuery()
+        })
+      }
+      this.showTab = true
    }
  }
 }