rev:新增设备状态监控功能；修改点位查询和批量修改；任务下方ACSAGV参数修改；烘箱温度和时间用redis进行存储和查询；

lms/nladmin-ui/src/views/system/user/user.js

@@ -33,6 +33,14 @@ export function editUser(data) {
   })
 }
 
+export function getUserList(data) {
+  return request({
+    url: 'api/users/getUserList',
+    method: 'post',
+    data
+  })
+}
+
 export function updatePass(user) {
   const data = {
     oldPass: encrypt(user.oldPass),
@@ -57,5 +65,5 @@ export function updateEmail(form) {
   })
 }
 
-export default { add, edit, del, updatePass }
+export default { add, edit, del, updatePass, getUserList }
 

lms/nladmin-ui/src/views/wms/agvrush/devicestatus/devicestatus.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/devicestatus',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/devicestatus/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/devicestatus',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

lms/nladmin-ui/src/views/wms/agvrush/devicestatus/index.vue

@@ -0,0 +1,195 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <el-input
+        v-model="query.search"
+        clearable
+        style="width: 300px"
+        size="mini"
+        placeholder="输入设备编码或设备名称"
+        prefix-icon="el-icon-search"
+        class="filter-item"
+      />
+      <rrOperation />
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="1100px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="140px">
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="设备编码" prop="device_code">
+                <el-input v-model="form.device_code" disabled style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="联系人" prop="upload_user">
+                <el-select v-model="form.upload_user" placeholder="请选择" filterable multiple clearable style="width: 250px">
+                  <el-option
+                    v-for="item in userList"
+                    :key="item.username"
+                    :label="item.username"
+                    :value="item.username"
+                  >
+                    <span style="float: left">{{ item.username }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.personName }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip width="150px" />
+        <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip width="150px" />
+        <el-table-column prop="product_area" label="区域" show-overflow-tooltip />
+        <el-table-column prop="device_type" label="设备类型" show-overflow-tooltip />
+        <el-table-column prop="mode" label="工作状态" show-overflow-tooltip />
+        <el-table-column prop="mode_update_time" label="工作状态变更时间" show-overflow-tooltip width="150px" />
+        <el-table-column prop="error" label="故障状态" show-overflow-tooltip />
+        <el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip />
+        <el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip />
+        <el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip />
+        <el-table-column label="是否上报" align="center" prop="upload_flag">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.upload_flag"
+              active-color="#409EFF"
+              inactive-color="#F56C6C"
+              active-value="1"
+              inactive-value="0"
+              @change="changeEnabled(scope.row, scope.row.upload_flag)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip />
+        <el-table-column
+          v-permission="['admin','customerbase:edit','customerbase:del']"
+          label="操作"
+          width="150px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :is-visiable-del="false"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudDeviceStatus from '@/views/wms/agvrush/devicestatus/devicestatus'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudUser from '@/views/system/user/user'
+
+const defaultForm = {
+  device_code: null,
+  upload_user: null
+}
+export default {
+  name: 'DeviceStatus',
+  dicts: ['is_used', 'print_temple'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '设备状态',
+      url: 'api/devicestatus',
+      optShow: {
+        add: true,
+        reset: true
+      },
+      idField: 'device_code',
+      sort: 'device_code,desc',
+      crudMethod: { ...crudDeviceStatus }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      classes: [],
+      userList: [],
+      rules: {}
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    [CRUD.HOOK.afterToCU](crud, form) {
+      this.getUserList()
+      form.upload_user = form.upload_user.split(',')
+    },
+    // 改变状态
+    getUserList() {
+      crudUser.getUserList().then(res => {
+        this.userList = res
+      })
+    },
+    changeEnabled(data, val) {
+      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.device_code + ', 是否继续？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        data.need_update_flag = '1'
+        crudDeviceStatus.edit(data).then(res => {
+          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        }).catch(() => {
+          if (data.upload_flag === '0') {
+            data.upload_flag = '1'
+            return
+          }
+          if (data.upload_flag === '1') {
+            data.upload_flag = '0'
+          }
+        })
+      }).catch(() => {
+        if (data.upload_flag === '0') {
+          data.upload_flag = '1'
+          return
+        }
+        if (data.upload_flag === '1') {
+          data.upload_flag = '0'
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -85,8 +85,7 @@
               style="width: 185px"
               value-format="yyyy-MM-dd"
               @change="hand"
-            >
-            </el-date-picker>
+            />
           </el-form-item>
           <el-form-item label="入库日期">
             <el-date-picker
@@ -96,8 +95,7 @@
               style="width: 185px"
               value-format="yyyy-MM-dd"
               @change="hand"
-            >
-            </el-date-picker>
+            />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
@@ -162,7 +160,7 @@
               />
             </el-select>
           </el-form-item>-->
-          <rrOperation :crud="crud"/>
+          <rrOperation :crud="crud" />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -179,196 +177,219 @@
         </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="1000px">
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="1000px"
+      >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
           <el-row>
             <el-col :span="12">
               <el-form-item label="木箱唯一码" prop="package_box_sn">
-                <el-input v-model="form.package_box_sn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.package_box_sn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="箱内子卷数量">
-                <el-input v-model="form.quanlity_in_box" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.quanlity_in_box" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="木箱自身重量">
-                <el-input v-model="form.box_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.box_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="保质期">
-                <el-input v-model="form.quality_guaran_period" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.quality_guaran_period" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="客户编码" prop="customer_name">
-                <el-input v-model="form.customer_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.customer_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="客户名称" prop="customer_description">
-                <el-input v-model="form.customer_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.customer_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="产品编码" prop="product_name">
-                <el-input v-model="form.product_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.product_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品描述" prop="product_description">
-                <el-input v-model="form.product_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.product_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="入库日期">
-                <el-input v-model="form.date_of_fg_inbound" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.date_of_fg_inbound" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="子卷号" prop="container_name">
-                <el-input v-model="form.container_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.container_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="产品规格(幅宽)" prop="width">
-                <el-input v-model="form.width" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.width" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品厚度" prop="thickness">
-                <el-input v-model="form.thickness" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.thickness" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="单位面积质量" prop="mass_per_unit_area">
-                <el-input v-model="form.mass_per_unit_area" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.mass_per_unit_area" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="净重" prop="net_weight">
-                <el-input v-model="form.net_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.net_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="长度" prop="length">
-                <el-input v-model="form.length" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.length" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="制造完成日期" prop="date_of_production">
-                <el-input v-model="form.date_of_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.date_of_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划外分切的子卷" prop="is_un_plan_production">
-                <el-input v-model="form.is_un_plan_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.is_un_plan_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="子卷的物性值1">
-                <el-input v-model="form.un_plan_product_property1" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.un_plan_product_property1" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="子卷的物性值2">
-                <el-input v-model="form.un_plan_product_property2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.un_plan_product_property2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="子卷的物性值3">
-                <el-input v-model="form.un_plan_product_property3" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.un_plan_product_property3" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="木箱料号">
-                <el-input v-model="form.box_type" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.box_type" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="SAP批次" prop="sap_pcsn">
-                <el-input v-model="form.sap_pcsn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.sap_pcsn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否重打外包装标签">
-                <el-input v-model="form.isreprintpackageboxlabel" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.isreprintpackageboxlabel" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否拆包重打子卷标签">
-                <el-input v-model="form.isunpackbox" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.isunpackbox" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="长" prop="box_length">
-                <el-input-number v-model="form.box_length" :max="10000" :min="0" :precision="2" :controls="false"
-                                 style="width: 300px;"/>
+                <el-input-number
+                  v-model="form.box_length"
+                  :max="10000"
+                  :min="0"
+                  :precision="2"
+                  :controls="false"
+                  style="width: 300px;"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="宽" prop="box_width">
-                <el-input-number v-model="form.box_width" :max="10000" :min="0" :precision="2" :controls="false"
-                                 style="width: 300px;"/>
+                <el-input-number
+                  v-model="form.box_width"
+                  :max="10000"
+                  :min="0"
+                  :precision="2"
+                  :controls="false"
+                  style="width: 300px;"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="高" prop="box_high">
-                <el-input-number v-model="form.box_high" :max="10000" :min="0" :precision="2" :controls="false"
-                                 style="width: 300px;"/>
+                <el-input-number
+                  v-model="form.box_high"
+                  :max="10000"
+                  :min="0"
+                  :precision="2"
+                  :controls="false"
+                  style="width: 300px;"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="销售订单及行号" prop="sale_order_name">
-                <el-input v-model="form.sale_order_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.sale_order_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="物料主数据厚度" prop="thickness_request">
-                <el-input v-model="form.thickness_request" :disabled="crud.status.edit > 0 && form.status !== '0'" :controls="false" style="width: 300px;"/>
+                <el-input v-model="form.thickness_request" :disabled="crud.status.edit > 0 && form.status !== '0'" :controls="false" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="要求幅宽" prop="width_standard">
-                <el-input v-model="form.width_standard" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;"/>
+                <el-input v-model="form.width_standard" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="备注">
-                <el-input type="textarea" :rows="2" v-model="form.remark" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 750px;"/>
+                <el-input v-model="form.remark" type="textarea" :rows="2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 750px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -379,94 +400,175 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" height v-loading="crud.loading" style="width: 100%" :data="crud.data" size="mini"
-                @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection"/>
-        <el-table-column sortable prop="package_box_sn" label="木箱码"
-                         :min-width="flexWidth('package_box_sn',crud.data,'木箱码')"/>
-        <el-table-column prop="quanlity_in_box" label="箱内子卷数量"
-                         :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')"/>
-        <el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')"/>
-        <el-table-column prop="customer_description" label="客户名称"
-                         :min-width="flexWidth('customer_description',crud.data,'客户名称')"/>
-        <el-table-column prop="sale_order_name" label="销售订单及行号"
-                         :min-width="flexWidth('sale_order_name',crud.data,'销售订单及行号')"/>
-        <el-table-column sortable prop="container_name" label="子卷号"
-                         :min-width="flexWidth('container_name',crud.data,'子卷号')"/>
-        <el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')"/>
-        <el-table-column prop="product_description" label="产品描述"
-                         :min-width="flexWidth('product_description',crud.data,'产品描述')"/>
-        <el-table-column sortable prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')"/>
-        <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')"/>
-        <el-table-column prop="width_standard" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')"/>
-        <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')"/>
-        <el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3"
-                         :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')"/>
-        <el-table-column prop="net_weight" label="净重" :formatter="crud.formatNum3"
-                         :min-width="flexWidth('net_weight',crud.data,'净重')"/>
-        <el-table-column prop="length" label="长度" :formatter="crud.formatNum3"
-                         :min-width="flexWidth('length',crud.data,'长度')"/>
-        <el-table-column prop="date_of_production" label="制造完成日期"
-                         :min-width="flexWidth('date_of_production',crud.data,'制造完成日期')"/>
-        <el-table-column prop="date_of_fg_inbound" label="入库日期"
-                         :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')"/>
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        height
+        style="width: 100%"
+        :data="crud.data"
+        size="mini"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" />
+        <el-table-column
+          sortable
+          prop="package_box_sn"
+          label="木箱码"
+          :min-width="flexWidth('package_box_sn',crud.data,'木箱码')"
+        />
+        <el-table-column
+          prop="quanlity_in_box"
+          label="箱内子卷数量"
+          :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')"
+        />
+        <el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
+        <el-table-column
+          prop="customer_description"
+          label="客户名称"
+          :min-width="flexWidth('customer_description',crud.data,'客户名称')"
+        />
+        <el-table-column
+          prop="sale_order_name"
+          label="销售订单及行号"
+          :min-width="flexWidth('sale_order_name',crud.data,'销售订单及行号')"
+        />
+        <el-table-column
+          sortable
+          prop="container_name"
+          label="子卷号"
+          :min-width="flexWidth('container_name',crud.data,'子卷号')"
+        />
+        <el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
+        <el-table-column
+          prop="product_description"
+          label="产品描述"
+          :min-width="flexWidth('product_description',crud.data,'产品描述')"
+        />
+        <el-table-column sortable prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
+        <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
+        <el-table-column prop="width_standard" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
+        <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
+        <el-table-column
+          prop="mass_per_unit_area"
+          label="单位面积质量"
+          :formatter="crud.formatNum3"
+          :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')"
+        />
+        <el-table-column
+          prop="net_weight"
+          label="净重"
+          :formatter="crud.formatNum3"
+          :min-width="flexWidth('net_weight',crud.data,'净重')"
+        />
+        <el-table-column
+          prop="length"
+          label="长度"
+          :formatter="crud.formatNum3"
+          :min-width="flexWidth('length',crud.data,'长度')"
+        />
+        <el-table-column
+          prop="date_of_production"
+          label="制造完成日期"
+          :min-width="flexWidth('date_of_production',crud.data,'制造完成日期')"
+        />
+        <el-table-column
+          prop="date_of_fg_inbound"
+          label="入库日期"
+          :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')"
+        />
         <el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态')">
           <template slot-scope="scope">
             {{ dict.label.sub_package_relation[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')"
-                         :formatter="crud.formatNum3"/>
-        <el-table-column prop="quality_guaran_period" label="保质期"
-                         :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')"/>
-        <el-table-column prop="is_un_plan_production" label="计划外分切的子卷"
-                         :min-width="flexWidth('is_un_plan_production',crud.data,'计划外分切的子卷')">
+        <el-table-column
+          prop="box_weight"
+          label="木箱自身重量"
+          :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')"
+          :formatter="crud.formatNum3"
+        />
+        <el-table-column
+          prop="quality_guaran_period"
+          label="保质期"
+          :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')"
+        />
+        <el-table-column
+          prop="is_un_plan_production"
+          label="计划外分切的子卷"
+          :min-width="flexWidth('is_un_plan_production',crud.data,'计划外分切的子卷')"
+        >
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.is_un_plan_production] }}
           </template>
         </el-table-column>
-        <el-table-column prop="un_plan_product_property1" label="子卷的物性值1"
-                         :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1',-220)"/>
-        <el-table-column prop="un_plan_product_property2" label="子卷的物性值2"
-                         :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的物性值2')"/>
-        <el-table-column prop="un_plan_product_property3" label="子卷的物性值3"
-                         :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的物性值3')"/>
-        <el-table-column prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')"/>
-        <el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')"/>
-        <el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')"/>
-        <el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')"/>
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
-        <el-table-column prop="vbeln" label="来源交货单" :min-width="flexWidth('vbeln',crud.data,'来源交货单')"/>
-        <el-table-column prop="posnr" label="来源交货单行" :min-width="flexWidth('posnr',crud.data,'来源交货单行')"/>
-        <el-table-column prop="sale_order_description" label="销售订单描述"
-                         :min-width="flexWidth('sale_order_description',crud.data,'销售订单描述')"/>
-        <el-table-column prop="isreprintpackageboxlabel" label="是否需要重打外包装标签"
-                         :min-width="flexWidth('isreprintpackageboxlabel',crud.data,'是否需要重打外包装标签')">
+        <el-table-column
+          prop="un_plan_product_property1"
+          label="子卷的物性值1"
+          :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1',-220)"
+        />
+        <el-table-column
+          prop="un_plan_product_property2"
+          label="子卷的物性值2"
+          :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的物性值2')"
+        />
+        <el-table-column
+          prop="un_plan_product_property3"
+          label="子卷的物性值3"
+          :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的物性值3')"
+        />
+        <el-table-column prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')" />
+        <el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')" />
+        <el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')" />
+        <el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')" />
+        <el-table-column prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
+        <el-table-column prop="standard_limit" label="内控标准抗拉下限" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下限')" />
+        <el-table-column prop="actual_value" label="生产实际抗拉值" :min-width="flexWidth('actual_value',crud.data,'生产实际抗拉值')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="vbeln" label="来源交货单" :min-width="flexWidth('vbeln',crud.data,'来源交货单')" />
+        <el-table-column prop="posnr" label="来源交货单行" :min-width="flexWidth('posnr',crud.data,'来源交货单行')" />
+        <el-table-column
+          prop="sale_order_description"
+          label="销售订单描述"
+          :min-width="flexWidth('sale_order_description',crud.data,'销售订单描述')"
+        />
+        <el-table-column
+          prop="isreprintpackageboxlabel"
+          label="是否需要重打外包装标签"
+          :min-width="flexWidth('isreprintpackageboxlabel',crud.data,'是否需要重打外包装标签')"
+        >
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.isreprintpackageboxlabel] }}
           </template>
         </el-table-column>
-        <el-table-column prop="isunpackbox" label="是否需要拆包重打子卷标签"
-                         :min-width="flexWidth('isunpackbox',crud.data,'是否需要拆包重打子卷标签')">
+        <el-table-column
+          prop="isunpackbox"
+          label="是否需要拆包重打子卷标签"
+          :min-width="flexWidth('isunpackbox',crud.data,'是否需要拆包重打子卷标签')"
+        >
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.isunpackbox] }}
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
-        <el-table-column v-permission="['admin','sub:edit','sub:del']" label="操作" align="center" fixed="right"
-                         min-width="120">
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column
+          v-permission="['admin','sub:edit','sub:del']"
+          label="操作"
+          align="center"
+          fixed="right"
+          min-width="120"
+        >
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
               :permission="permission"
-              :isVisiableDel="false"
+              :is-visiable-del="false"
             />
           </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -357,7 +357,7 @@
 
 <script>
 import crudRegion from '@/views/wms/sch/region/region'
-import crudPoint, { changeActive } from '@/views/wms/sch/point/point'
+import crudPoint, { changeActive, changeActives } from '@/views/wms/sch/point/point'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -503,9 +503,7 @@ export default {
       })
     },
     changeUsed(data, flag) { // 更改启用状态
-      const param = data[0]
-      param.lock_type = flag
-      crudPoint.changeActive(param).then(res => {
+      crudPoint.changeActives(data).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })

lms/nladmin-ui/src/views/wms/sch/point/point.js

@@ -37,6 +37,14 @@ export function changeActive(data) {
   })
 }
 
+export function changeActives(data) {
+  return request({
+    url: 'api/point/changeActives',
+    method: 'put',
+    data
+  })
+}
+
 export function getPoint(data) {
   return request({
     url: '/api/point/getPoint',
@@ -82,4 +90,4 @@ export function download() {
   })
 }
 
-export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock, sync }
+export default { add, edit, del, changeActive, changeActives, findPoints, getPoint, getRegion, changeUsed, changeLock, sync }

lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue

@@ -189,7 +189,10 @@
         <el-table-column show-overflow-tooltip prop="input_optname" label="入库人" :min-width="flexWidth('input_optname',crud.data,'入库人')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品规格" :min-width="flexWidth('width',crud.data,'产品规格')" />
         <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
-        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="mass_per_unit_area" label="单位面积" :formatter="crud.formatNum2" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="mass_per_unit_area" label="单位面积" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="standard_limit" label="内控标准抗拉下线" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下线')" />
+        <el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="actual_value" label="生产实际抗拉值" :min-width="flexWidth('actual_value',crud.data,'生产实际抗拉值')" />
         <el-table-column show-overflow-tooltip prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
       </el-table>
       <!--分页组件-->