no message
							parent
							
								
									5e37bba2cd
								
							
						
					
					
						commit
						39cfbabd19
					
				| 
						 | 
					@ -2,6 +2,6 @@ ENV = 'production'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
 | 
					# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
 | 
				
			||||||
# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
 | 
					# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
 | 
				
			||||||
VUE_APP_BASE_API  = 'http://192.168.0.159:8000'
 | 
					VUE_APP_BASE_API  = 'http://47.117.45.79:8000'
 | 
				
			||||||
# 如果接口是 http 形式, wss 需要改为 ws
 | 
					# 如果接口是 http 形式, wss 需要改为 ws
 | 
				
			||||||
VUE_APP_WS_API = 'ws://192.168.0.159:8000'
 | 
					VUE_APP_WS_API = 'ws://47.117.45.79:8000'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,7 +51,7 @@
 | 
				
			||||||
          slot="right"
 | 
					          slot="right"
 | 
				
			||||||
          style="float: right;padding-left: 5px"
 | 
					          style="float: right;padding-left: 5px"
 | 
				
			||||||
          :headers="headers"
 | 
					          :headers="headers"
 | 
				
			||||||
          :action="baseApi +'/api/point/import_point' "
 | 
					          :action="baseApi +'/api/point/importPoint' "
 | 
				
			||||||
          :file-list="fileList"
 | 
					          :file-list="fileList"
 | 
				
			||||||
          :on-error="handleErr"
 | 
					          :on-error="handleErr"
 | 
				
			||||||
          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
					          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
				
			||||||
| 
						 | 
					@ -94,11 +94,11 @@
 | 
				
			||||||
      >
 | 
					      >
 | 
				
			||||||
        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
 | 
					        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
          <el-form-item label="代码" prop="code">
 | 
					          <el-form-item label="库位" prop="code">
 | 
				
			||||||
            <el-input v-model="form.code" style="width: 370px;"/>
 | 
					            <el-input v-model="form.code" style="width: 370px;"/>
 | 
				
			||||||
          </el-form-item>
 | 
					          </el-form-item>
 | 
				
			||||||
          <el-form-item label="名称">
 | 
					          <el-form-item label="停靠点">
 | 
				
			||||||
            <el-input v-model="form.name" style="width: 370px;"/>
 | 
					            <el-input v-model="form.beatCode" style="width: 370px;"/>
 | 
				
			||||||
          </el-form-item>
 | 
					          </el-form-item>
 | 
				
			||||||
          <el-form-item label="类型" prop="type">
 | 
					          <el-form-item label="类型" prop="type">
 | 
				
			||||||
            <el-select v-model="form.type" filterable placeholder="请选择" style="width: 370px;"
 | 
					            <el-select v-model="form.type" filterable placeholder="请选择" style="width: 370px;"
 | 
				
			||||||
| 
						 | 
					@ -157,8 +157,8 @@
 | 
				
			||||||
                @selection-change="crud.selectionChangeHandler"
 | 
					                @selection-change="crud.selectionChangeHandler"
 | 
				
			||||||
      >
 | 
					      >
 | 
				
			||||||
        <el-table-column type="selection" width="55"/>
 | 
					        <el-table-column type="selection" width="55"/>
 | 
				
			||||||
        <el-table-column prop="code" label="代码"/>
 | 
					        <el-table-column prop="code" label="库位号"/>
 | 
				
			||||||
        <el-table-column prop="name" label="名称"/>
 | 
					        <el-table-column prop="beatCode" label="停靠点"/>
 | 
				
			||||||
        <el-table-column prop="type" label="类型">
 | 
					        <el-table-column prop="type" label="类型">
 | 
				
			||||||
          <template slot-scope="scope">
 | 
					          <template slot-scope="scope">
 | 
				
			||||||
            {{ dict.label.point_type[scope.row.type] }}
 | 
					            {{ dict.label.point_type[scope.row.type] }}
 | 
				
			||||||
| 
						 | 
					@ -169,17 +169,11 @@
 | 
				
			||||||
            {{ dict.label.use_status[scope.row.status] }}
 | 
					            {{ dict.label.use_status[scope.row.status] }}
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column prop="description" label="存储类型"/>
 | 
					 | 
				
			||||||
        <el-table-column :show-overflow-tooltip="true" prop="areaName" label="库区">
 | 
					        <el-table-column :show-overflow-tooltip="true" prop="areaName" label="库区">
 | 
				
			||||||
          <template slot-scope="scope">
 | 
					          <template slot-scope="scope">
 | 
				
			||||||
            <div>{{ scope.row.area.name }}</div>
 | 
					            <div>{{ scope.row.area.name }}</div>
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column :show-overflow-tooltip="true" prop="deptName" label="仓库">
 | 
					 | 
				
			||||||
          <template slot-scope="scope">
 | 
					 | 
				
			||||||
            <div>{{ scope.row.dept.name }}</div>
 | 
					 | 
				
			||||||
          </template>
 | 
					 | 
				
			||||||
        </el-table-column>
 | 
					 | 
				
			||||||
        <el-table-column label="启用" align="center" prop="enabled">
 | 
					        <el-table-column label="启用" align="center" prop="enabled">
 | 
				
			||||||
          <template slot-scope="scope">
 | 
					          <template slot-scope="scope">
 | 
				
			||||||
            <el-switch
 | 
					            <el-switch
 | 
				
			||||||
| 
						 | 
					@ -223,7 +217,7 @@ import viewFullStockOut from '@/views/base-data/point/fullStockOut.vue'
 | 
				
			||||||
import pointUrl from '@/api/point'
 | 
					import pointUrl from '@/api/point'
 | 
				
			||||||
import { mapGetters } from 'vuex'
 | 
					import { mapGetters } from 'vuex'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const defaultForm = { id: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null }
 | 
					const defaultForm = { id: null, status: 'FREE', enabled: 1, code: null, beatCode: null, description: null, area: null }
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  name: 'Point',
 | 
					  name: 'Point',
 | 
				
			||||||
  components: {
 | 
					  components: {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -54,6 +54,7 @@
 | 
				
			||||||
      <el-table-column prop="routeCode" label="编组/线路"/>
 | 
					      <el-table-column prop="routeCode" label="编组/线路"/>
 | 
				
			||||||
      <el-table-column prop="srcPositionCode" label="起点"/>
 | 
					      <el-table-column prop="srcPositionCode" label="起点"/>
 | 
				
			||||||
      <el-table-column prop="dstPositionCode" label="目标库位"/>
 | 
					      <el-table-column prop="dstPositionCode" label="目标库位"/>
 | 
				
			||||||
 | 
					      <el-table-column prop="beatCode" label="停靠点"/>
 | 
				
			||||||
      <el-table-column prop="repMessage" label="返回报文"/>
 | 
					      <el-table-column prop="repMessage" label="返回报文"/>
 | 
				
			||||||
      <el-table-column prop="createTime" label="日期"/>
 | 
					      <el-table-column prop="createTime" label="日期"/>
 | 
				
			||||||
    </el-table>
 | 
					    </el-table>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue