Browse Source

7.10

master
fengdong777 2 years ago
parent
commit
b2fd7ed92d
  1. 17
      warehousing-system/project_web/src/assets/css/global.css
  2. 7
      warehousing-system/project_web/src/components/Home.vue
  3. 22
      warehousing-system/project_web/src/components/initial_value/location.vue
  4. 6
      warehousing-system/project_web/src/components/initial_value/product.vue
  5. 282
      warehousing-system/project_web/src/components/initial_value/storehouse.vue
  6. 5
      warehousing-system/project_web/src/components/initial_value/supplier.vue
  7. 6
      warehousing-system/project_web/src/components/instorehouse/purchase.vue
  8. 6
      warehousing-system/project_web/src/components/instorehouse/putInList.vue
  9. 6
      warehousing-system/project_web/src/components/instorehouse/putInManagement.vue
  10. 6
      warehousing-system/project_web/src/components/instorehouse/receivingManagement.vue
  11. 6
      warehousing-system/project_web/src/components/outStorehouseManagement/outList.vue
  12. 6
      warehousing-system/project_web/src/components/outStorehouseManagement/outStorehouseOrder.vue
  13. 6
      warehousing-system/project_web/src/components/outStorehouseManagement/pickingManagement.vue
  14. 6
      warehousing-system/project_web/src/components/stockManagement/stock.vue
  15. 6
      warehousing-system/project_web/src/components/stockManagement/stockList.vue
  16. 6
      warehousing-system/project_web/src/components/storehouseManage/removeManagement.vue
  17. 8
      warehousing-system/project_web/src/components/storehouseManage/shelvesManage.vue
  18. 212
      warehousing-system/project_web/src/components/uploadFile/uploadTwo.vue
  19. 216
      warehousing-system/project_web/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
  20. 2
      warehousing-system/project_web/src/main.js
  21. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue

17
warehousing-system/project_web/src/assets/css/global.css

@ -12,7 +12,8 @@ body,
/* 定义卡片样式 */
.el-card {
margin-top: 15px;
width: 100%;
height: 100%;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15) !important;
}
@ -35,4 +36,18 @@ body,
video {
min-height: 200px;
min-width: 100%;
}
.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 160px);}
.pages {
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: flex-end;
padding: 0 0 15px 15px;
}
.el-table .el-table__header tr th {
background: #edf1f7;
color: #333;
padding: 8px 0;
font-size: 16px;
}

7
warehousing-system/project_web/src/components/Home.vue

@ -160,6 +160,7 @@ export default {
<!-- 防止样式重叠 -->
<style lang="less" scoped>
/deep/ [data-v-8dc7cce2] .el-submenu__title {
height: 40px;
line-height: 40px;
@ -209,6 +210,12 @@ export default {
.el-main {
background-color: #eeeeee;
display: block;
flex: 1;
flex-basis: auto;
overflow: auto;
box-sizing: border-box;
padding: 0px;
}
.home-container {

22
warehousing-system/project_web/src/components/initial_value/location.vue

@ -11,6 +11,7 @@
<el-button type="primary" @click="addLocationDialog">新增</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="locationList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed height="500">
@ -50,7 +51,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -60,6 +61,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="locationDialogVisible" width="65%" @close="closeLocationDialog">
@ -74,23 +77,14 @@
<el-form-item label="货位类型" prop="type">
<el-select v-model="locationForm.type" placeholder="请选择" >
<el-option
v-for="type in typeList"
:key="type.type"
v-for="(type,i) in typeList"
:key="i"
:label="type.type"
:value="type.type">
:value="type.type"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="货位状态" prop="status">
<el-select v-model="locationForm.status" placeholder="请选择" >
<el-option
v-for="type in status"
:key="type.value"
:label="type.value"
:value="type.value">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="所属仓库" prop="storehouse">
<el-select v-model="locationForm.storehouse" placeholder="请选择" >
<el-option

6
warehousing-system/project_web/src/components/initial_value/product.vue

@ -11,6 +11,7 @@
<el-button type="primary" @click="addProductDialogVisible=true">新增</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="productList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed height="500">
@ -75,7 +76,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -85,7 +86,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog title="新增商品" :visible.sync="addProductDialogVisible" width="65%" @close="closeAddProductDialog">

282
warehousing-system/project_web/src/components/initial_value/storehouse.vue

@ -22,7 +22,8 @@
>
</el-col>
</el-row>
<el-table :data="storehouseList" style="width: 100%" border height="500">
<div class="main-content">
<el-table :data="storehouseList" style="width: 100%" border >
<el-table-column
label="序号"
type="index"
@ -30,7 +31,7 @@
:index="indexMethod"
align="center"
/>
<el-table-column prop="custerName" label="客户名称" align="center">
<el-table-column prop="custerName" label="客户名称" width="240" align="center">
</el-table-column>
<el-table-column prop="name" label="仓库名称" align="center">
</el-table-column>
@ -86,7 +87,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -97,6 +98,8 @@
:total="total"
>
</el-pagination>
</div>
</div>
</el-card>
<el-dialog
@ -107,18 +110,22 @@
<el-form
:model="form"
:rules="rules"
ref="form"
label-position="right"
class="demo-form-inline"
ref="dataForm"
label-position="top" label-width="190px"
class="formadd"
>
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div style="margin-left: 15px;">主体信息</div>
</div>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>客户名称</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item">
<span slot="label">客户名称</span>
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="custerName">
<el-col :span="8">
<el-form-item class="trightbs_item">
<el-select
size="small"
v-model="form.custerName"
placeholder="请选择"
>
@ -133,13 +140,12 @@
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>仓库名称</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库名称</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="name">
<el-col :span="8">
<el-form-item class="trightbs_item">
<el-input
size="small"
v-model="form.name"
placeholder="仓库名称"
class="addinputw"
@ -147,13 +153,15 @@
/>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>仓库简称</span>
</el-row>
<el-row>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库简称</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="simpleName"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.simpleName"
placeholder="仓库简称"
class="addinputw"
@ -161,13 +169,12 @@
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>仓库编码</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库编码</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="code"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.code"
placeholder="仓库编码"
class="addinputw"
@ -177,12 +184,40 @@
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>所属地&nbsp;&nbsp;&nbsp; </span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库坐标精度</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
v-model="form.lon"
placeholder="精度"
class="addinputw"
clearable
/></el-form-item>
</el-col>
<el-form-item prop="simpleName">
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库坐标维度</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
v-model="form.lat"
placeholder="维度"
class="addinputw"
clearable
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">所属地</span></el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightbs_item">
<el-select
size="small"
class="arriveClass"
v-model="form.provinceName"
placeholder="请选择省"
@ -198,7 +233,6 @@
</el-select>
<el-select
size="small"
class="arriveClass"
v-model="form.cityName"
placeholder="请选择市"
@ -215,7 +249,6 @@
</el-select>
<el-select
size="small"
class="arriveClass"
v-model="form.countyName"
:disabled="changeCounty"
@ -230,16 +263,16 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>详细地址</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">详细地址</span></el-form-item>
</el-col>
<el-col :span="15" class="trightb">
<el-form-item prop="address"
<el-col :span="20">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.address"
placeholder="详细地址"
class="addinputw"
@ -248,13 +281,12 @@
</el-col>
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>库房面积</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">库房面积</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="acreage"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.acreage"
placeholder="库房面积"
class="addinputw"
@ -262,40 +294,38 @@
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>库房高度</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">库房高度</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="storeyHeight"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.storeyHeight"
placeholder="库房高度"
class="addinputw"
clearable
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>月租金</span>
</el-row>
<el-row>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">月租金</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="monthlyPrice"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.monthlyPrice"
placeholder="月租金"
class="addinputw"
clearable
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>库房性质名称</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">库房性质名称</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="attributeNames">
<el-col :span="8">
<el-form-item class="trightbs_item">
<el-input
size="small"
v-model="form.attributeNames"
placeholder="库房性质名称"
class="addinputw"
@ -307,13 +337,12 @@
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>房源信息</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">房源信息</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="housingResource"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.housingResource"
placeholder="房源"
class="addinputw"
@ -321,54 +350,52 @@
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>联系人姓名</span>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">联系人姓名</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="linkerName"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.linkerName"
placeholder="联系人姓名"
class="addinputw"
clearable
/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>联系人电话</span>
</el-row>
<el-row>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">联系人电话</span></el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="linkerPhone"
<el-col :span="8">
<el-form-item class="trightbs_item"
><el-input
size="small"
v-model="form.linkerPhone"
placeholder="联系人电话"
class="addinputw"
clearable
style="position:relative; top:50px;"
/></el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库图片</span></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<uploadTwo class="item_input" ref="uploadImg" v-model="imgPrl" @change="backData" bucket="map"
:upload-data="{ type: '0001' }"
></uploadTwo>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3.2" class="tleftb">
<span><span class="icon">*</span>附件</span>
</el-col>
<el-col :span="2" class="trightb">
<el-form-item prop="picUrl">
<el-upload
ref="upload"
class="upload-demo"
accept=".xls"
:action="updateAction"
:file-list="fileList"
:on-progress="handleProgress"
:on-success="handleSuccess"
:multiple="false"
:limit="1"
>
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item"><span slot="label">仓库详细图片</span></el-form-item>
</el-col>
<el-col :span="20">
<el-form-item class="trightbs_item">
<upload class="item_input" ref="uploadImg" v-model="imgList" @change="backDatas" bucket="map"
:upload-data="{ type: '0001' }"></upload>
</el-form-item>
</el-col>
</el-row>
@ -507,6 +534,29 @@
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item">
<span slot="label">仓库坐标精度</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{ temp.lon }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item">
<span slot="label">仓库坐标维度</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<span>{{ temp.lat }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item">
@ -564,19 +614,6 @@
<span>{{ temp.attributeNames }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightbs">
<el-form-item class="trightbs_item">
<span slot="label">仓库信息表</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightbs_item">
<el-button v-if="temp.picUrl" type="text" @click="toDownload()"
>下载仓库信息表</el-button
>
<div v-else>没有信息表文件</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
@ -585,7 +622,13 @@
</template>
<script>
import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
import uploadTwo from '@/components/uploadFile/uploadTwo.vue'
export default {
components: {
upload,
uploadTwo
},
data() {
return {
queryInfo: {
@ -642,10 +685,15 @@ export default {
housingResource: "",
linkerName: "",
linkerPhone: "",
picUrl: "",
picUrl: '',
lon: "",
lat: "",
pics:[]
},
CITY: [],
XIAN: [],
imgList: [],
imgPrl: [],
temp: {},
custList: [],
mapApiKey: "map",
@ -686,7 +734,10 @@ export default {
housingResource: "",
linkerName: "",
linkerPhone: "",
picUrl: "",
picUrl: '',
lon: "",
lat: "",
pics:[]
};
},
async getStorehouseList() {
@ -698,6 +749,7 @@ export default {
this.storehouseList = result.data.records;
},
addStorehouseDialog() {
this.clearList()
this.title = "新增仓库";
this.storehouseDialogVisible = true;
},
@ -708,6 +760,7 @@ export default {
}
},
updataStorehousedialog(storehouse) {
console.log(storehouse);
this.form = storehouse;
this.title = "修改仓库";
this.storehouseDialogVisible = true;
@ -891,6 +944,19 @@ export default {
window.open(this.temp.picUrl, "_blank");
}
},
backDatas(value) {
const aa = []
if (value.length > 0 && value != null && value != undefined) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].sid)
}
}
this.form.pics = aa
},
backData(value) {
this.form.picUrl = value[0].response.data
},
},
mounted() {
this.getStorehouseList();

5
warehousing-system/project_web/src/components/initial_value/supplier.vue

@ -11,6 +11,7 @@
<el-button type="primary" @click="addSupplierDialog">新增</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="supplierList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed height="500">
@ -46,7 +47,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -56,6 +57,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="supplierDialogVisible" width="65%" @close="closeSupplierDialog">

6
warehousing-system/project_web/src/components/instorehouse/purchase.vue

@ -11,6 +11,7 @@
<el-button type="primary" @click="openAddPurchaseDialog" icon = "el-icon-circle-plus" >新增</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="purchaseList.slice((queryInfo.current-1)*queryInfo.size,queryInfo.current*queryInfo.size)"
style="width: 100%"
stripe
@ -65,7 +66,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -75,7 +76,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog title="添加采购订单" :visible.sync="addPurchaseDialogVisible" width="75%">

6
warehousing-system/project_web/src/components/instorehouse/putInList.vue

@ -13,6 +13,7 @@
<el-button type="danger" @click="cancelInStorehouse" icon = "el-icon-error">撤销入库</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="inStorehouseList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -82,7 +83,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -92,7 +93,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="inputDialogVisible" width="75%" @close="closeSupplierDialog">

6
warehousing-system/project_web/src/components/instorehouse/putInManagement.vue

@ -14,6 +14,7 @@
</el-col>
</el-row>
<div class="main-content">
<el-table :data="inStorehouseList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -68,7 +69,7 @@
label="备注">
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -78,7 +79,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
</div>

6
warehousing-system/project_web/src/components/instorehouse/receivingManagement.vue

@ -13,6 +13,7 @@
<el-button type="danger" @click="cancelReceiving" icon = "el-icon-error">撤销接货</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="receivingList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -68,7 +69,7 @@
width="180">
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -78,7 +79,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
</div>

6
warehousing-system/project_web/src/components/outStorehouseManagement/outList.vue

@ -14,6 +14,7 @@
<el-button type="success" @click="out" icon = "el-icon-success">出库</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="outStorehouseList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -83,7 +84,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -93,7 +94,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog :title="title" :visible.sync="outputDialogVisible" width="75%" @close="closeSupplierDialog">

6
warehousing-system/project_web/src/components/outStorehouseManagement/outStorehouseOrder.vue

@ -14,6 +14,7 @@
<el-button type="success" @click="out" icon = "el-icon-success">出库</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="outStorehouseList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -99,7 +100,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -109,7 +110,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<el-dialog title="新增出库" :visible.sync="addOutStorehouseDialogVisible" width="65%" @close="closeAddOutStorehouseDialog">

6
warehousing-system/project_web/src/components/outStorehouseManagement/pickingManagement.vue

@ -12,6 +12,7 @@
<el-button type="danger" @click="cancel" icon = "el-icon-error">撤销拣货</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="pickingList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -66,7 +67,7 @@
</template>
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -76,7 +77,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
</div>

6
warehousing-system/project_web/src/components/stockManagement/stock.vue

@ -8,6 +8,7 @@
</el-input>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="stockList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed>
@ -57,7 +58,7 @@
width="180">
</el-table-column>
</el-table>
<div class="pages">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -67,7 +68,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
</div>

6
warehousing-system/project_web/src/components/stockManagement/stockList.vue

@ -8,6 +8,7 @@
</el-input>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="stockList"
style="width: 100%" height="500"
stripe border fixed>
@ -79,7 +80,7 @@
width="120">
</el-table-column>
</el-table>
<div class="main-content">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -89,7 +90,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
</div>

6
warehousing-system/project_web/src/components/storehouseManage/removeManagement.vue

@ -13,6 +13,7 @@
<el-button type="danger" @click="cancelRemove" icon = "el-icon-error">撤销移库</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="removeList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -78,7 +79,7 @@
width="180">
</el-table-column>
</el-table>
<div class="main-content">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -88,7 +89,8 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</div>
</el-card>
</div>

8
warehousing-system/project_web/src/components/storehouseManage/shelvesManage.vue

@ -13,6 +13,7 @@
<el-button type="danger" @click="cancelShelves" icon = "el-icon-error">撤销上架</el-button>
</el-col>
</el-row>
<div class="main-content">
<el-table :data="onShelvesList.slice((queryInfo.pageNum-1)*queryInfo.pageSize,queryInfo.pageNum*queryInfo.pageSize)"
style="width: 100%"
stripe border fixed
@ -88,7 +89,7 @@
width="180">
</el-table-column>
</el-table>
<div class="main-content">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -97,8 +98,9 @@
:page-size="queryInfo.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</el-pagination>
</div>
</div>
</el-card>
</div>

212
warehousing-system/project_web/src/components/uploadFile/uploadTwo.vue

@ -0,0 +1,212 @@
<template>
<div>
<el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile"
:accept="accept" list-type="picture-card" :file-list="files" :on-remove="removeImage"
:on-preview="handlePictureCardPreview" :on-progress="uploadProgrees"
:on-error="uploadError" :on-success="uploadImgSuccess_FuJian" :on-change="handleLimit">
<i class="el-icon-plus avatar-uploader-icon" />
</el-upload>
<el-dialog :visible.sync="dialogVisible" title="查看图片">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</div>
</template>
<script>
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
type: String,
default: 'abc'
},
//
width: {
type: String,
default: '270px'
},
// limit: {
// type: Number,
// default: ''
// },
accept: {
type: String,
default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
},
//
name: {
type: Array,
required: true
},
uploadData: {
type: Object,
default: {}
}
},
data() {
return {
dialogImageUrl: '',
dialogVisible: false,
accessToken: null,
fileList_FuJian: [],
enclosure: '',
file_add: '',
file_catch: '',
files: [],
files_list: [],
filedUrl: '',
isview: false,
nameArr: '',
loadding: false,
uploadFile:
"http://jianguan.yyundong.com/warehouseapi/v1/shstorehouse/upload",
}
},
watch: {
name: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
this.files = newVal
}
}
},
mounted() {
this.$nextTick(() => {
this.Init()
})
},
created() {
},
methods: {
showImg(imgList) {
this.files = imgList
},
view() {
// window.open(this.filedUrl)
},
handleLimit(file, list) {
if (list.length > 0) {
this.files = [list[list.length - 1]]; // csv
}
},
Init() {
if (this.name !== undefined) {
this.files = []
for (var i = 0; i < this.name.length; i++) {
this.files.push({
name: this.name[i],
url: this.name[i]
})
}
}
},
handlePictureCardPreview(file) {
this.dialogVisible = true
this.dialogImageUrl = file.url
},
// --
uploadImgSuccess_FuJian(response, file, fileList) {
if (file.response.code === '200') {
this.loadding = false
//
this.filedUrl = file.response.data
this.$emit('change', this.files)
this.$emit('eett', this.files)
}
},
removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1)
const imgFiles = []
this.files.forEach((o) => {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))
console.log('fileList:' + JSON.stringify(fileList))
this.enclosure = ''
// 1. id(this.file_add)
this.getNewFileId(fileList)
// 2. id(this.file_catch)
this.getCatchFileId(file)
// 3. id
this.getFileId()
// 4. id
this.$emit('change', this.enclosure)
},
// this.file_add(id)
getNewFileId(fileList) {
// debugger
this.file_add = ''
for (var i = 0; i < fileList.length; i++) {
if (fileList[i].response && fileList[i].response.code === '200') {
this.file_add = this.file_add + fileList[i].response.data + ','
}
}
if (this.file_add !== '') {
this.file_add = this.file_add.substring(0, this.file_add.length - 1)
}
// console.log('1. this.file_add: ' + this.file_add)
},
// this.file_catchid
getCatchFileId(file) {
for (var i = 0; i < this.files_list.length; i++) {
if (this.file_catch !== '') {
// 1. id
if (this.files_list[i].name === file.name) {
// 2. file_catchfils_arry
var fils_arry = this.file_catch.split(',')
// 3. fils_arry this.files_list[i].id
var arry = []
fils_arry.forEach((element) => {
//
if (element !== this.files_list[i].id) {
arry.push(element)
}
})
// 4. file_catch
this.file_catch = arry.join(',')
}
}
}
// console.log('2. this.file_catch:' + this.file_catch)
},
// id
getFileId() {
// console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
if (this.file_catch !== '') {
if (this.file_add !== '') {
this.enclosure = this.file_catch + ',' + this.file_add
} else {
this.enclosure = this.file_catch
}
} else {
this.enclosure = this.file_add
}
},
//
uploadError() {
this.loadding = false
},
uploadProgrees(event, file, fileList) {
if (Number(event.percent) > 0) {
this.loadding = true
}
// console.log('event:', event)
}
}
}
</script>
<style scoped></style>

216
warehousing-system/project_web/src/components/uploadFile/upload_yanchejianchaTuBiao.vue

@ -0,0 +1,216 @@
<template>
<div>
<el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile"
:accept="accept" list-type="picture-card" :file-list="files" :on-remove="removeImage"
:on-preview="handlePictureCardPreview" :on-progress="uploadProgrees"
:on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
<i class="el-icon-plus avatar-uploader-icon" />
</el-upload>
<el-dialog :visible.sync="dialogVisible" title="查看图片">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</div>
</template>
<script>
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
type: String,
default: 'abc'
},
//
width: {
type: String,
default: '270px'
},
// limit: {
// type: Number,
// default: ''
// },
accept: {
type: String,
default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
},
//
name: {
type: Array,
required: true
},
uploadData: {
type: Object,
default: {}
}
},
data() {
return {
dialogImageUrl: '',
dialogVisible: false,
accessToken: null,
fileList_FuJian: [],
enclosure: '',
file_add: '',
file_catch: '',
files: [],
files_list: [],
filedUrl: '',
isview: false,
nameArr: '',
loadding: false,
uploadFile:
"http://jianguan.yyundong.com/warehouseapi/v1/shstorehouse/uploadPics",
}
},
watch: {
name: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
this.files = newVal
}
}
},
mounted() {
this.$nextTick(() => {
this.Init()
})
},
created() {
},
methods: {
showImg(imgList) {
this.files = imgList
},
view() {
// window.open(this.filedUrl)
},
//
Init() {
if (this.name !== undefined) {
this.files = []
for (var i = 0; i < this.name.length; i++) {
this.files.push({
name: this.name[i],
url: this.name[i]
})
}
}
},
handlePictureCardPreview(file) {
this.dialogVisible = true
this.dialogImageUrl = file.url
},
// --
uploadImgSuccess_FuJian(response, file, fileList) {
console.log('您选择的file:', file)
if (file.response.code === '200') {
this.loadding = false
//
this.filedUrl = file.response.data
// var uid = file.response.data
this.files.push({
name: file.response.data.fileName,
url: file.response.data.fileUrl,
sid: file.response.data.sid
})
this.$emit('change', this.files)
this.$emit('eett', this.files)
}
},
removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1)
const imgFiles = []
this.files.forEach((o) => {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))
console.log('fileList:' + JSON.stringify(fileList))
this.enclosure = ''
// 1. id(this.file_add)
this.getNewFileId(fileList)
// 2. id(this.file_catch)
this.getCatchFileId(file)
// 3. id
this.getFileId()
// 4. id
this.$emit('change', this.enclosure)
},
// this.file_add(id)
getNewFileId(fileList) {
// debugger
this.file_add = ''
for (var i = 0; i < fileList.length; i++) {
if (fileList[i].response && fileList[i].response.code === '200') {
this.file_add = this.file_add + fileList[i].response.data + ','
}
}
if (this.file_add !== '') {
this.file_add = this.file_add.substring(0, this.file_add.length - 1)
}
// console.log('1. this.file_add: ' + this.file_add)
},
// this.file_catchid
getCatchFileId(file) {
for (var i = 0; i < this.files_list.length; i++) {
if (this.file_catch !== '') {
// 1. id
if (this.files_list[i].name === file.name) {
// 2. file_catchfils_arry
var fils_arry = this.file_catch.split(',')
// 3. fils_arry this.files_list[i].id
var arry = []
fils_arry.forEach((element) => {
//
if (element !== this.files_list[i].id) {
arry.push(element)
}
})
// 4. file_catch
this.file_catch = arry.join(',')
}
}
}
// console.log('2. this.file_catch:' + this.file_catch)
},
// id
getFileId() {
// console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
if (this.file_catch !== '') {
if (this.file_add !== '') {
this.enclosure = this.file_catch + ',' + this.file_add
} else {
this.enclosure = this.file_catch
}
} else {
this.enclosure = this.file_add
}
},
//
uploadError() {
this.loadding = false
},
uploadProgrees(event, file, fileList) {
if (Number(event.percent) > 0) {
this.loadding = true
}
// console.log('event:', event)
}
}
}
</script>
<style scoped></style>

2
warehousing-system/project_web/src/main.js

@ -16,7 +16,7 @@ import 'quill/dist/quill.bubble.css' // for bubble theme
import axios from 'axios'
/* 设定axios的请求根目录 */
axios.defaults.baseURL = 'http://8.130.39.13:9050'
axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi'
//axios.defaults.baseURL = 'http://127.0.0.1:9050/'
// axios.defaults.baseURL = 'http://manage.jt.com/'
// axios.defaults.baseURL = 'http://yichuwh.com/'

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue

@ -11,7 +11,6 @@
</el-dialog>
</div>
</template>
<script>
import {
uploadFile
@ -19,7 +18,6 @@
import {
getStorage
} from '@/utils/auth.js'
export default {
model: {
prop: 'name',

Loading…
Cancel
Save