opt：修改分切下料、穿拔轴区域等功能

lms/nladmin-ui/src/views/b_lms/bst/ivt/cutpointivt/index.vue

@@ -51,7 +51,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="区域位置">
+          <el-form-item label="上下位置">
             <el-select
               v-model="query.point_location"
               clearable

lms/nladmin-ui/src/views/b_lms/bst/ivt/paper/index.vue

@@ -0,0 +1,180 @@
+<template>
+  <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="120px"
+          label-suffix=":"
+        >
+          <el-form-item label="管芯/纸管编码">
+            <el-input
+              v-model="query.paper_code"
+              clearable
+              placeholder="输入管芯/纸管编码"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" >
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-printer"
+          size="mini"
+          @click="print"
+        >
+          打印
+        </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="600px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
+          <el-form-item label="管芯编码">
+            <el-input v-model="form.paper_code" disabled placeholder="系统生成" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="FRP管/纸管编码">
+            <el-input v-model="form.material_code" disabled class="input-with-select" style="width: 200px">
+              <el-button slot="append" icon="el-icon-search" @click="queryMater()" />
+            </el-input>
+          </el-form-item>
+          <el-form-item label="FRP管/纸管描述">
+            <el-input v-model="form.material_name" disabled style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="理论重量">
+            <el-input-number v-model="form.standard_weight"  :precision="3" :controls="false" :min="0" style="width: 200px" />
+          </el-form-item>
+          <el-form-item label="实际重量">
+            <el-input v-model="form.fact_weight" disabled style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="修改时间">
+            <el-input v-model="form.update_time" disabled style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="修改人姓名">
+            <el-input v-model="form.update_optname" disabled style="width: 200px;" />
+          </el-form-item>
+        </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 type="selection" width="55" />
+        <el-table-column prop="ivt_id" v-if="false" label="载具标识" :min-width="flexWidth('ivt_id',crud.data,'载具标识')" />
+        <el-table-column prop="paper_code" label="管芯编码" :min-width="flexWidth('paper_code',crud.data,'管芯编码')" />
+        <el-table-column prop="material_code" label="物料号" :min-width="flexWidth('material_code',crud.data,'物料号')" />
+        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="standard_weight" label="理论重量" :formatter="crud.formatNum3" :min-width="flexWidth('qty',crud.data,'理论重量')" />
+        <el-table-column prop="fact_weight" label="实际重量" :formatter="crud.formatNum3" :min-width="flexWidth('qty',crud.data,'实际重量')" />
+        <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改人姓名')" />
+        <el-table-column   v-permission="['admin','paper:del','paper:edit','paper:add']" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+      <MaterDialog :dialog-show.sync="materShow" @setMaterValue="tableChanged" />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudMdPbPaper from './mdPbPaper'
+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 MaterDialog from '@/views/wms/pub/MaterDialog'
+
+const defaultForm = {
+  ivt_id: null,
+  paper_code: null,
+  material_code: null,
+  material_name: null,
+  standard_weight: null,
+  fact_weight: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null
+}
+export default {
+  name: 'MdPbPaper',
+  components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '管芯管理',
+      url: 'api/mdPbPaper',
+      idField: 'ivt_id',
+      sort: 'ivt_id,desc',
+      crudMethod: { ...crudMdPbPaper },
+      optShow: {
+        add: true,
+        edit: true,
+        del: true,
+        download: false,
+        reset: true
+      }
+    })
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'paper:add'],
+        edit: ['admin', 'paper:edit'],
+        del: ['admin', 'paper:del']
+      },
+      materShow: false,
+      rules: {
+        standard_weight: [
+          { required: true, message: '标准重量不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    tableChanged(row) {
+      this.form.material_code = row.material_code
+      this.form.material_name = row.material_name
+    },
+    async queryMater() {
+      this.materShow = true
+    },
+    print() {
+      const _selectData = this.$refs.table.selection
+      if (!_selectData || _selectData.length < 1) {
+        this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudMdPbPaper.print(_selectData).then(res => {
+        this.crud.notify('打印成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

lms/nladmin-ui/src/views/b_lms/bst/ivt/paper/mdPbPaper.js

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

lms/nladmin-ui/src/views/b_lms/bst/ivt/papervehicle/index.vue

@@ -2,20 +2,61 @@
   <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="120px"
+          label-suffix=":"
+        >
+          <el-form-item label="管芯编码">
+            <el-input
+              v-model="query.paper_code"
+              clearable
+              placeholder="输入管芯编码"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="托盘编码">
+            <el-input
+              v-model="query.vehicle_code"
+              clearable
+              placeholder="输入托盘编码"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_code"
+              clearable
+              placeholder="输入物料编码"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="500px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="载具标识">
-            <el-input v-model="form.ivt_id" style="width: 370px;" />
-          </el-form-item>
           <el-form-item label="托盘号">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="排">
             <el-input v-model="form.row_num" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="列">
+            <el-input v-model="form.col_num" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item label="管芯编码">
+            <el-input v-model="form.paper_code" style="width: 370px;" />
+          </el-form-item>
           <el-form-item label="物料号">
             <el-input v-model="form.material_code" style="width: 370px;" />
           </el-form-item>
@@ -26,13 +67,10 @@
             <el-input v-model="form.qty" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="修改时间">
-            <el-input v-model="form.update_optid" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="修改人">
-            <el-input v-model="form.update_optname" style="width: 370px;" />
+            <el-input v-model="form.update_time" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="修改人姓名">
-            <el-input v-model="form.update_time" style="width: 370px;" />
+            <el-input v-model="form.update_optname" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -43,9 +81,11 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="ivt_id" label="载具标识" :min-width="flexWidth('ivt_id',crud.data,'载具标识')" />
+        <el-table-column prop="ivt_id" v-if="false" label="载具标识" :min-width="flexWidth('ivt_id',crud.data,'载具标识')" />
         <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')" />
         <el-table-column prop="row_num" label="排" :min-width="flexWidth('row_num',crud.data,'排')" />
+        <el-table-column prop="col_num" label="列" :min-width="flexWidth('col_num',crud.data,'列')" />
+        <el-table-column prop="paper_code" label="管芯编码" :min-width="flexWidth('paper_code',crud.data,'管芯编码')" />
         <el-table-column prop="material_code" label="物料号" :min-width="flexWidth('material_code',crud.data,'物料号')" />
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')" />
@@ -57,6 +97,7 @@
             <udOperation
               :data="scope.row"
               :permission="permission"
+              :is-visiable-edit="false"
             />
           </template>
         </el-table-column>
@@ -96,7 +137,14 @@ export default {
       url: 'api/mdPbPapervehicle',
       idField: 'ivt_id',
       sort: 'ivt_id,desc',
-      crudMethod: { ...crudMdPbPapervehicle }
+      crudMethod: { ...crudMdPbPapervehicle },
+      optShow: {
+        add: false,
+        edit: false,
+        del: true,
+        download: false,
+        reset: true
+      }
     })
   },
   data() {

lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/index.vue

@@ -2,6 +2,68 @@
   <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.point_code"
+              clearable
+              placeholder="输入点位编码"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="点位类型">
+            <el-select
+              v-model="query.point_type"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.STOCK_POINT_TYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="区域位置">
+            <el-select
+              v-model="query.point_location"
+              clearable
+              filterable
+              size="mini"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.stockingivt_product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="是否启用">
+            <el-switch
+              v-model="query.is_used"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -17,7 +79,19 @@
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="区域">
-            <el-input v-model="form.product_area" style="width: 370px;" />
+            <el-select
+              v-model="form.product_area"
+              size="mini"
+              placeholder="区域"
+              class="filter-item"
+              style="width: 370px;"
+            >
+              <el-option
+                v-for="item in dict.stockingivt_product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="点位类型">
             <el-select
@@ -49,21 +123,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="位置">
-            <el-select
-              v-model="form.point_location"
-              size="mini"
-              placeholder="位置"
-              class="filter-item"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in dict.point_location"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
           <el-form-item label="顺序号" prop="sort_seq">
             <el-input v-model="form.sort_seq" style="width: 370px;" />
           </el-form-item>
@@ -94,10 +153,6 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')"/>
-<!--          <template slot-scope="scope">
-            <el-link type="primary" @click="toView(scope.$index, scope.row)">{{ scope.row.point_code }}</el-link>
-          </template>
-        </el-table-column>-->
         <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
         <el-table-column prop="vehicle_code" label="托盘号" :min-width="flexWidth('vehicle_code',crud.data,'托盘号')">
           <template slot-scope="scope">
@@ -114,9 +169,9 @@
             {{ dict.label.STOCK_POINT_STATUS[scope.row.ivt_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="point_location" label="位置" :min-width="flexWidth('point_location',crud.data,'位置')">
+        <el-table-column prop="product_area" label="所属区域" :min-width="flexWidth('product_area',crud.data,'所属区域')">
           <template slot-scope="scope">
-            {{ dict.label.point_location[scope.row.point_location] }}
+            {{ dict.label.stockingivt_product_area[scope.row.product_area] }}
           </template>
         </el-table-column>
         <el-table-column prop="sort_seq" label="顺序号" :min-width="flexWidth('sort_seq',crud.data,'顺序号')" />
@@ -128,7 +183,6 @@
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
         <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
-        <el-table-column prop="plan" label="规划" :min-width="flexWidth('plan',crud.data,'规划')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -176,7 +230,7 @@ const defaultForm = {
 }
 export default {
   name: 'BstIvtStockingivt',
-  dicts: ['STOCK_POINT_STATUS', 'STOCK_POINT_TYPE', 'point_location'],
+  dicts: ['STOCK_POINT_STATUS', 'STOCK_POINT_TYPE', 'stockingivt_product_area'],
   components: { TubeDialog2, pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -200,9 +254,6 @@ export default {
       permission: {
       },
       rules: {
-        ivt_id: [
-          { required: true, message: '库存记录标识不能为空', trigger: 'blur' }
-        ],
         point_code: [
           { required: true, message: '点位编码不能为空', trigger: 'blur' }
         ],
@@ -211,15 +262,6 @@ export default {
         ],
         is_used: [
           { required: true, message: '是否启用不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '创建人不能为空', trigger: 'blur' }
-        ],
-        create_name: [
-          { required: true, message: '创建人不能为空', trigger: 'blur' }
-        ],
-        create_time: [
-          { required: true, message: '创建时间不能为空', trigger: 'blur' }
         ]
       },
       showView: false,

lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/tubeDialog2.vue

@@ -21,6 +21,8 @@
       >
         <el-table-column min-width="50" show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" />
         <el-table-column min-width="50" show-overflow-tooltip prop="row_num" label="排" align="center" />
+        <el-table-column min-width="50" show-overflow-tooltip prop="col_num" label="列" align="center" />
+        <el-table-column prop="paper_code" label="管芯编码" align="center" width="150" />
         <el-table-column prop="material_code" label="物料号" align="center" width="150" />
         <el-table-column prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="50" prop="qty" label="数量" align="center" :formatter="crud.formatNum0" />

lms/nladmin-ui/src/views/login.vue

@@ -52,7 +52,7 @@ export default {
   name: 'Login',
   data() {
     return {
-      title: '甘肃海亮铜箔LMS',
+      title: '印尼海亮铜箔LMS',
       Background: Background,
       logo: Logo,
       codeUrl: '',