no message
							parent
							
								
									cb49faaefd
								
							
						
					
					
						commit
						eafa8599e7
					
				| 
						 | 
					@ -83,7 +83,7 @@
 | 
				
			||||||
        <el-table-column prop="xh" label="序号" type="index" width="50"/>
 | 
					        <el-table-column prop="xh" label="序号" type="index" width="50"/>
 | 
				
			||||||
        <el-table-column prop="code" label="编码"  />
 | 
					        <el-table-column prop="code" label="编码"  />
 | 
				
			||||||
        <el-table-column prop="name" label="名称" :show-overflow-tooltip="true" width="300px" />
 | 
					        <el-table-column prop="name" label="名称" :show-overflow-tooltip="true" width="300px" />
 | 
				
			||||||
        <el-table-column prop="extendD1" label="容器装载数"/>
 | 
					<!--        <el-table-column prop="extendD1" label="容器装载数"/>-->
 | 
				
			||||||
        <el-table-column prop="unit" label="单位" />
 | 
					        <el-table-column prop="unit" label="单位" />
 | 
				
			||||||
        <el-table-column prop="enabled" label="启用" width="50">
 | 
					        <el-table-column prop="enabled" label="启用" width="50">
 | 
				
			||||||
          <template slot-scope="scope">
 | 
					          <template slot-scope="scope">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,8 +38,9 @@
 | 
				
			||||||
          />
 | 
					          />
 | 
				
			||||||
        </el-select>
 | 
					        </el-select>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <label class="el-form-item-label">冷却区-小库区编号</label>
 | 
					        <label class="el-form-item-label" v-show="false">冷却区-小库区编号</label>
 | 
				
			||||||
        <el-select
 | 
					        <el-select
 | 
				
			||||||
 | 
					          v-show="false"
 | 
				
			||||||
          v-model="query.beatCode"
 | 
					          v-model="query.beatCode"
 | 
				
			||||||
          clearable
 | 
					          clearable
 | 
				
			||||||
          size="small"
 | 
					          size="small"
 | 
				
			||||||
| 
						 | 
					@ -73,6 +74,7 @@
 | 
				
			||||||
        </el-upload>
 | 
					        </el-upload>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <el-button
 | 
					        <el-button
 | 
				
			||||||
 | 
					          v-show="false"
 | 
				
			||||||
          slot="right"
 | 
					          slot="right"
 | 
				
			||||||
          class="filter-item"
 | 
					          class="filter-item"
 | 
				
			||||||
          size="mini"
 | 
					          size="mini"
 | 
				
			||||||
| 
						 | 
					@ -189,13 +191,13 @@
 | 
				
			||||||
            {{ 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 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 prop="beatCode" label="冷却区-小库区编号"/>
 | 
					<!--        <el-table-column prop="beatCode" label="冷却区-小库区编号"/>-->
 | 
				
			||||||
        <el-table-column :show-overflow-tooltip="true" prop="deptName" label="仓库">
 | 
					        <el-table-column :show-overflow-tooltip="true" prop="deptName" label="仓库">
 | 
				
			||||||
          <template slot-scope="scope">
 | 
					          <template slot-scope="scope">
 | 
				
			||||||
            <div>{{ scope.row.dept.name }}</div>
 | 
					            <div>{{ scope.row.dept.name }}</div>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -147,10 +147,10 @@
 | 
				
			||||||
              :data="scope.row"
 | 
					              :data="scope.row"
 | 
				
			||||||
              :permission="permission"
 | 
					              :permission="permission"
 | 
				
			||||||
              :show-dle="false"
 | 
					              :show-dle="false"
 | 
				
			||||||
              :showContainerOut="true"
 | 
					              :showContainerOut="false"
 | 
				
			||||||
              :showContainerIn="true"
 | 
					              :showContainerIn="false"
 | 
				
			||||||
              :callContainer="true"
 | 
					              :callContainer="false"
 | 
				
			||||||
              :showReturnEntity="true"
 | 
					              :showReturnEntity="false"
 | 
				
			||||||
            >
 | 
					            >
 | 
				
			||||||
            </udOperation>
 | 
					            </udOperation>
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,7 +6,8 @@
 | 
				
			||||||
        <!-- 搜索 -->
 | 
					        <!-- 搜索 -->
 | 
				
			||||||
        <label class="el-form-item-label">代码</label>
 | 
					        <label class="el-form-item-label">代码</label>
 | 
				
			||||||
        <el-input v-model="query.code" clearable placeholder="代码" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
 | 
					        <el-input v-model="query.code" clearable placeholder="代码" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
 | 
				
			||||||
        <rrOperation :crud="crud" />
 | 
					<!--        <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
 | 
				
			||||||
 | 
					        <rrOperation :crud="crud"/>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
 | 
					      <!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
 | 
				
			||||||
      <crudOperation :permission="permission" :tableKey="this.$options.name">
 | 
					      <crudOperation :permission="permission" :tableKey="this.$options.name">
 | 
				
			||||||
| 
						 | 
					@ -15,7 +16,7 @@
 | 
				
			||||||
          slot='right'
 | 
					          slot='right'
 | 
				
			||||||
          style="float: right;padding-left: 5px"
 | 
					          style="float: right;padding-left: 5px"
 | 
				
			||||||
          :headers="headers"
 | 
					          :headers="headers"
 | 
				
			||||||
          action="/api/point/import_point"
 | 
					          action="/api/studen/import_studen"
 | 
				
			||||||
          :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);}"
 | 
				
			||||||
| 
						 | 
					@ -35,9 +36,9 @@
 | 
				
			||||||
          <el-form-item label="名称" prop="name">
 | 
					          <el-form-item label="名称" prop="name">
 | 
				
			||||||
            <el-input v-model="form.name" style="width: 370px;" />
 | 
					            <el-input v-model="form.name" style="width: 370px;" />
 | 
				
			||||||
          </el-form-item>
 | 
					          </el-form-item>
 | 
				
			||||||
<!--          <el-form-item label="是否启用">-->
 | 
					          <el-form-item label="是否启用">
 | 
				
			||||||
<!--            <el-input v-model="form.enabled" style="width: 370px;" />-->
 | 
					            <el-input v-model="form.enabled" style="width: 370px;" />
 | 
				
			||||||
<!--          </el-form-item>-->
 | 
					          </el-form-item>
 | 
				
			||||||
          <el-form-item label="创建人">
 | 
					          <el-form-item label="创建人">
 | 
				
			||||||
            <el-input v-model="form.creator" style="width: 370px;" />
 | 
					            <el-input v-model="form.creator" style="width: 370px;" />
 | 
				
			||||||
          </el-form-item>
 | 
					          </el-form-item>
 | 
				
			||||||
| 
						 | 
					@ -59,18 +60,18 @@
 | 
				
			||||||
      <!--表格渲染-->
 | 
					      <!--表格渲染-->
 | 
				
			||||||
      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
 | 
					      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
 | 
				
			||||||
        <el-table-column type="selection" width="55" />
 | 
					        <el-table-column type="selection" width="55" />
 | 
				
			||||||
<!--        <el-table-column prop="id" label="序号" />-->
 | 
					        <el-table-column prop="id" label="序号" />
 | 
				
			||||||
        <el-table-column prop="code" label="代码" />
 | 
					        <el-table-column prop="code" label="代码" />
 | 
				
			||||||
        <el-table-column prop="name" label="名称" />
 | 
					        <el-table-column prop="name" label="名称" />
 | 
				
			||||||
        <el-table-column prop="enabled" label="是否启用" >
 | 
					        <el-table-column prop="enabled" label="是否启用">
 | 
				
			||||||
        <template slot-scope="scope">
 | 
					          <template slot-scope="scope">
 | 
				
			||||||
          <el-switch
 | 
					            <el-switch
 | 
				
			||||||
            v-model="scope.row.enabled"
 | 
					              v-model="scope.row.enabled"
 | 
				
			||||||
            active-color="#409EFF"
 | 
					              active-color="#409EFF"
 | 
				
			||||||
            inactive-color="#F56C6C"
 | 
					              inactive-color="#F56C6C"
 | 
				
			||||||
            @change="changeEnabled(scope.row, scope.row.enabled)"
 | 
					              @change="changeEnabled(scope.row,scope.row.enabled)"
 | 
				
			||||||
          />
 | 
					            />
 | 
				
			||||||
        </template>
 | 
					          </template>
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <el-table-column prop="creator" label="创建人" />
 | 
					        <el-table-column prop="creator" label="创建人" />
 | 
				
			||||||
        <el-table-column prop="creationTime" label="创建时间" />
 | 
					        <el-table-column prop="creationTime" label="创建时间" />
 | 
				
			||||||
| 
						 | 
					@ -132,22 +133,22 @@ export default {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  methods: {
 | 
					  methods: {
 | 
				
			||||||
 | 
					    // 钩子:在获取表格数据之前执行,false 则代表不获取数据
 | 
				
			||||||
 | 
					    [CRUD.HOOK.beforeRefresh]() {
 | 
				
			||||||
 | 
					      return true
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    handleSuccess(response, file, fileList, crud) {
 | 
					    handleSuccess(response, file, fileList, crud) {
 | 
				
			||||||
      // 转字符串
 | 
					      // let myError = response.toString();//转字符串
 | 
				
			||||||
      // let myError = response.toString()
 | 
					      this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS);
 | 
				
			||||||
      this.crud.notify(response['message'], CRUD.NOTIFICATION_TYPE.SUCCESS)
 | 
					 | 
				
			||||||
      crud.toQuery()
 | 
					      crud.toQuery()
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    handleErr(err, file, fileList) {
 | 
					    handleErr(err, file, fileList) {
 | 
				
			||||||
      let myError = err.toString()// 转字符串
 | 
					      let myError = err.toString()// 转字符串
 | 
				
			||||||
      myError = myError.replace(' Error : ', '') // 去掉前面的" Error: "
 | 
					      myError = myError.replace('Error: ', '') // 去掉前面的" Error: "
 | 
				
			||||||
      myError = JSON.parse(myError)// 转对象
 | 
					      myError = JSON.parse(myError)// 转对象
 | 
				
			||||||
      this.crud.notify(myError['message'], CRUD.NOTIFICATION_TYPE.ERROR)
 | 
					      this.crud.notify(myError['message'], CRUD.NOTIFICATION_TYPE.ERROR)
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    // 钩子:在获取表格数据之前执行,false 则代表不获取数据
 | 
					    // 改变状态
 | 
				
			||||||
    [CRUD.HOOK.beforeRefresh]() {
 | 
					 | 
				
			||||||
      return true
 | 
					 | 
				
			||||||
    }, // 改变状态
 | 
					 | 
				
			||||||
    changeEnabled(data, val) {
 | 
					    changeEnabled(data, val) {
 | 
				
			||||||
      this.$confirm('此操作将 "' + this.dict.label.base_staus[val] + '" ' + data.code + ', 是否继续?', '提示', {
 | 
					      this.$confirm('此操作将 "' + this.dict.label.base_staus[val] + '" ' + data.code + ', 是否继续?', '提示', {
 | 
				
			||||||
        confirmButtonText: '确定',
 | 
					        confirmButtonText: '确定',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue