添加 工作站配置 页面，配置默认执行方案

src/views/base-data/box/index.vue

@@ -5,27 +5,22 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <label class="el-form-item-label">编号</label>
+        <el-input v-model="query.code" clearable placeholder="请输入编号" style="width: 185px;" class="filter-item"
-        <el-input v-model="query.code" clearable placeholder="请输入编号" style="width: 120px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
-        <label class="el-form-item-label">物料代码</label>
+        <el-input v-model="query.itemCode" clearable placeholder="请输入物料代码" style="width: 185px;" class="filter-item"
-        <el-input v-model="query.itemCode" clearable placeholder="请输入物料代码" style="width: 120px;"
-                  class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
 
-        <label class="el-form-item-label">点位编码</label>
         <el-input
             v-model="query.pointCode"
             clearable
             placeholder="请输入点位编码"
-          style="width: 120px;"
+            style="width: 185px;"
             class="filter-item"
             @keyup.enter.native="crud.toQuery"/>
 
-        <label class="el-form-item-label">是否启用</label>
+        <el-select v-model="query.enabled" clearable placeholder="是否启用" style="width: 100px;" class="filter-item"
-        <el-select v-model="query.enabled" clearable placeholder="请选择" style="width: 120px;" class="filter-item"
+                   @keyup.enter.native="crud.toQuery"  @change="crud.toQuery">
-                   @keyup.enter.native="crud.toQuery">
           <el-option
               v-for="baseStatus in dict.base_staus"
               :key="baseStatus.id"
@@ -34,170 +29,78 @@
           />
         </el-select>
 
-
-        <label class="el-form-item-label">库区</label>
-        <el-select v-model="query.areaName" @focus="getArea"   style="width: 120px;" filterable  clearable placeholder="请选择" @keyup.enter.native="crud.toQuery" class="filter-item"  @change="crud.toQuery">
-          <el-option
-            v-for="area in areas"
-            :key="area.id"
-            :label="area.name"
-            :value="area.name"
-          />
-        </el-select>
         <rrOperation :crud="crud"/>
-
       </div>
 
-      <crudOperation :permission="permission" :tableKey="this.$options.name">
+      <crudOperation :permission="permission">
-
-
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          v-show="true"
-          :loading="crud.delAllLoading"
-          @click="bindOrder"
-        >
-          预装按钮盒绑定
-        </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          v-show="false"
-          :disabled="crud.selections.length !== 1"
-          :loading="crud.delAllLoading"
-          @click="bindOrder"
-        >
-          按钮盒呼叫
-        </el-button>
       </crudOperation>
-      <!--      预装绑定按钮盒弹窗界面-->
-      <BindOrderNumber ref="bindOrderNumber"/>
       <!--表单组件-->
       <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="small" label-width="90px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="编号">
+          <el-form-item label="编号" prop="code">
             <el-input v-model="form.code" style="width: 370px;"/>
           </el-form-item>
-
+          <el-form-item label="名称" prop="name">
-          <el-form-item label="名称">
             <el-input v-model="form.name" style="width: 370px;"/>
           </el-form-item>
-
+          <el-form-item label="业务类型">
-          <el-form-item label="点位" prop="point">
+            <el-select
-            <el-select v-model="form.point" filterable placeholder="请选点位" value-key="id"
+                v-model="form.lampCode"
-                       style="width: 370px;">
+                size="small"
-              <el-option
+                placeholder="业务类型"
-                v-for="point in points"
+                class="filter-item"
-                :key="point.id"
+                style="width: 370px"
-                :label="point.code"
-                :value="point"
-                :disabled="point.status!='FREE'"
             >
-                <span style="float: left">{{ point.code }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ point.area.name }}</span>
-
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="物料" >
-            <el-select v-model="form.item" @focus="getItem" filterable placeholder="请选择物料" value-key="id"
-                       style="width: 370px;">
               <el-option
-                v-for="item in items"
+                  v-for="item in dict.bill_type"
                   :key="item.id"
-                :label="item.code"
-                :value="item"
-                :disabled="!item.enabled"
-              >
-              <span style="float: left">{{ item.code}}</span>
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="工单号">
-            <el-input v-model="form.orderNumber" style="width: 370px;"/>
-          </el-form-item>
-          <!-- 新增ip、指示灯、按钮盒 -->
-          <el-form-item label="IP">
-            <el-input v-model="form.iP" style="width: 370px;"/>
-          </el-form-item>
-          <el-form-item label="指示灯状态">
-              <el-select v-model="form.lampStatus"  filterable placeholder="请选择物料" style="width: 370px;">
-                <el-option
-                  v-for="item in this.dict.lamp_status"
-                  :key="item.value"
                   :label="item.label"
                   :value="item.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="按钮盒编号">
+          <el-form-item label="地标" prop="point" >
-<!--            <el-input v-model="form.lampCode" style="width: 370px;"/>-->
+            <el-select v-model="form.point"  value-key="id" filterable placeholder="请选择" style="width: 370px;">
-            <el-select v-model="form.lampCode" clearable filterable placeholder="请选择编号" style="width: 370px;">
               <el-option
-                v-for="item in this.dict.lamp_code"
+                  v-for="item in pointList"
-                :key="item.value"
+                  :key="item.id"
-                :label="item.label"
+                  :label="item.name"
-                :value="item.value"
+                  :value="item"
               />
             </el-select>
           </el-form-item>
 
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="crud.cancelCU">取消</el-button>
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
           <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
       <el-table
+          border
           ref="table"
           v-loading="crud.loading"
           :data="crud.data"
           size="small"
           style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
+          @selection-change="crud.selectionChangeHandler">
-        @select="selectOneMethod"
-        @select-all="selectAllMethod"
-      >
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="xh" label="序号" type="index" width="50"/>
         <el-table-column prop="code" label="编号"/>
         <el-table-column prop="name" label="名称"/>
-        <el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料编码">
+        <el-table-column :show-overflow-tooltip="true" prop="status" label="业务类型">
           <template slot-scope="scope">
-            <div>{{ scope.row.item==null?"":scope.row.item.code }}</div>
+            {{ dict.label.bill_type[scope.row.lampCode] }}
           </template>
         </el-table-column>
 
         <el-table-column :show-overflow-tooltip="true" prop="pointName" label="点位编码">
           <template slot-scope="scope">
-            <div>{{ scope.row.point.code }}</div>
+            <div v-if="scope.row.point!=null">{{ scope.row.point.code }}</div>
           </template>
         </el-table-column>
 
-        <el-table-column  label="点位库区"  prop="areaName">
-          <template slot-scope="scope">
-            <div>{{ scope.row.point.area.name }}</div>
-          </template>
-        </el-table-column>
-
-
-
-        <el-table-column prop="orderNumber" label="工单号"/>
-        <el-table-column prop="iP" label="IP"/>
-        <el-table-column prop="lampStatus" label="指示灯状态"/>
-        <el-table-column prop="lampCode" label="按钮盒编号"/>
-
         <el-table-column prop="enabled" label="启用">
           <template slot-scope="scope">
             <el-switch
@@ -209,7 +112,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-if="checkPer(['admin','box:edit','box:del'])" label="操作" width="60px" align="center">
+        <el-table-column v-if="checkPer(['admin','box:edit','box:del'])" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
                 :data="scope.row"
@@ -218,13 +121,6 @@
             />
           </template>
         </el-table-column>
-        <el-table-column
-          fixed="right"
-          width="60px">
-          <template slot-scope="scope">
-            <el-button @click="callBox(scope.row)" type="primary" align="center" size="small">呼叫</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <!--分页组件-->
       <div style="float: right;">
@@ -241,38 +137,34 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import {getItemsList} from "@/api/item"
+import {getItems} from "@/api/item"
-import pointUrl, {queryPointList} from "@/api/point"
+import crudPoint, {getPoints} from "@/api/point"
-import {getAres, queryAreaList} from "@/api/area"
-import BindOrderNumber from "@/views/base-data/box/bindOrderNumber.vue"
 import DonMessage from '@/utils/message'
+import crudBillType from '@/api/billType'
+import { mapGetters } from 'vuex'
+import { getToken } from '@/utils/auth'
 
 const defaultForm = {
-  name:null,
-  code:null,
   id: null,
+  code: null,
   item: null,
   point: null,
-  orderNumber:null,
   createBy: null,
   updateBy: null,
   createTime: null,
-  updateTime: null,
+  updateTime: null
-  iP:null,
-  lampStatus:null,
-  lampCode:null
 }
 export default {
   name: 'Box',
-  components: {pagination, crudOperation, rrOperation, udOperation, BindOrderNumber},
+  components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['base_staus','lamp_status','lamp_code'],
+  dicts: ['base_staus', 'bill_type'],
   cruds() {
     return CRUD({
-      title: '按钮盒',
+      title: '工作站配置',
       url: 'api/box',
       idField: 'id',
-      sort: 'name',
+      sort: 'id,desc',
       crudMethod: {...crudBox},
       optShow: {
         add: true,
@@ -284,29 +176,32 @@ export default {
 
     })
   },
+  computed: {
+    ...mapGetters([
+      'baseApi',
+      'boxUploadApi'
+    ])
+  },
+  mounted() {
+    this.getPoint()
+  },
   data() {
     return {
+      headers: { 'Authorization': getToken() },
       items: [],
-      points: [],
+      pointList: [],
-      pointsUpdate:[],
-      pointsInsert:[],
-      areas: [],
       params: {
-        type: 'BOX',
+        type: ''
-        status:'FREE',
-        enabled:1
       },
       permission: {
         add: ['admin', 'box:add'],
         edit: ['admin', 'box:edit'],
-        del: ['admin', 'box:del']
+        del: ['admin', 'box:del'],
-      },
+        callBox: ['admin', 'box:callBox']
-      CallBox: {
-        id: ''
       },
       rules: {
-        orderNumber: [
+        code: [
-          {required: true, message: '工单号必填', trigger: 'blur'}
+          {required: true, message: '编号必填', trigger: 'blur'}
         ],
         item: [
           {required: true, message: '物料必填', trigger: 'blur'}
@@ -317,24 +212,46 @@ export default {
       }
     }
   },
-  mounted() {
-    //编辑下拉出现内容
-    this.getItem();
-  },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    getItem() {
+    // 加载地标
-      getItemsList({}).then(res => {
+    getPoint() {
-        this.items = res;
+      crudPoint.getPoints({ }).then(res => {
+        this.pointList = res.map(function(obj) {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
       })
     },
-    getArea() {
+    callBox(datas) {
-      queryAreaList({ }).then(res => {
+      if (this.$refs.table.selection.length >= 1) {
-        this.areas= res;
+        this.$confirm(`选中的${datas.length}条数据呼叫确认?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const ids = [];
+          for (let i = 0; i < datas.length; i++) {
+            ids.push(datas[i].id)
+          }
+          crudBox.callBox(ids).then(res => {
+            this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+            this.crud.toQuery();
           })
+
+        }).catch(() => {
+          this.$refs.table.clearSelection()
+          DonMessage.info('取消成功！')
+        });
+      } else {
+        DonMessage.error('请至少选中一条记录！')
+      }
+
     },
     changeEnabled(data, val) {
       this.$confirm('此操作将 "' + this.dict.label.base_staus[val] + '" ' + data.code + ', 是否继续？', '提示', {
@@ -350,36 +267,6 @@ export default {
       }).catch(() => {
         data.enabled = !data.enabled
       })
-    },
-    bindOrder() {
-      this.$refs.bindOrderNumber.dialogVisible = true
-    },
-    //呼叫按钮
-    callBox(data) {
-      this.CallBox.id=data.id
-      crudBox.callBox(this.CallBox).then(res => {
-        if(res.status==200){
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
-          this.$parent.shuaxinContainerList()
-          this.$refs['form'].resetFields();
-        }else{
-          this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
-        }
-      }).catch(() => {
-        this.crud.notify("呼叫失败", CRUD.NOTIFICATION_TYPE.ERROR);
-      })
-    },
-    //单选时触发
-    selectOneMethod(selection, row){
-    if (selection.length===1){
-      this.points=this.pointsUpdate;
-    }else {
-      this.points=this.pointsInsert;
-    }
-    },
-    //全选时触发
-    selectAllMethod(selection){
-      this.points=this.pointsInsert;
     }
   }
 }

src/views/base-data/point/index.vue

@@ -187,7 +187,7 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+      <el-table border ref="table" height="66vh" 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="code" label="代码"/>

src/views/business-data/asn/index.vue

@@ -79,7 +79,7 @@
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" />
         <el-table-column prop="orderDate" label="订单时间" />
-        <el-table-column v-if="checkPer(['admin','asn:edit','asn:del'])" label="操作" width="350px" align="center">
+        <el-table-column v-if="checkPer(['admin','asn:edit','asn:del'])" label="操作" align="center">
           <template slot-scope="scope">
             <!--            <udOperation
                 :data="scope.row"

src/views/business-data/asnDetail/index.vue

@@ -41,7 +41,7 @@
       <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
       <rrOperation :crud="crud"/>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name">
+      <crudOperation :permission="permission" :table-key="this.$options.name">
         <el-button
           slot="right"
           v-permission="permission.checkAsn"