| .env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| RuoYi-Vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| package.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/logistics/transportGPS/WL_YayBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -5,7 +5,7 @@ ENV = 'development' # 智云迈思L-MOM管理系统/开发环境 VUE_APP_BASE_API = http://localhost:81/API/ # VUE_APP_BASE_API = http://localhost:81/API/ # VUE_APP_BASE_API = 'http://47.96.97.237/API/' # VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/' # VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/' @@ -15,12 +15,11 @@ # VUE_APP_BASE_API_INNER = http://192.168.1.11/API/ # VUE_APP_BASE_API = http://61.174.29.234:8880/API/ # 宁波 四维尔 # VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/ # VUE_APP_BASE_API = http://220.189.218.155:9010/API/ VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/ VUE_APP_BASE_API = http://220.189.218.155:9010/API/ #杜贺 # VUE_APP_BASE_API = http://localhost:8082/API/ # 内网地址测试 VUE_APP_BASE_API_INNER = http://192.168.1.11/API/ # VUE_APP_BASE_API_INNER = http://192.168.1.11/API/ # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true RuoYi-Vue
File was deleted package.json
@@ -24,24 +24,34 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { "@claviska/jquery-minicolors": "^2.3.6", "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "bwip-js": "^4.9.0", "canvg": "^3.0.11", "clipboard": "2.0.8", "core-js": "^3.46.0", "dayjs": "^1.11.19", "dom-to-image-more": "^3.7.2", "echarts": "5.4.0", "element-ui": "2.15.14", "file-saver": "2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", "jquery": "^3.7.1", "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsbarcode": "^3.12.3", "jsencrypt": "3.0.0-rc.1", "jspdf": "^2.5.2", "lodash": "^4.17.21", "moment": "^2.30.1", "nprogress": "0.2.0", "nzh": "^1.0.14", "print-js": "^1.6.0", "quill": "2.0.2", "screenfull": "5.0.2", "socket.io-client": "^4.8.3", "sortablejs": "^1.10.2", "splitpanes": "2.4.1", "vue": "2.6.12", @@ -50,39 +60,29 @@ "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0", "xlsx": "^0.18.5", "@claviska/jquery-minicolors": "^2.3.6", "bwip-js": "^4.0.0", "canvg": "^3.0.10", "dom-to-image-more": "3.7.2", "jquery": "^3.6.0", "jsbarcode": "^3.11.5", "jspdf": "^2.5.1", "lodash": "^4.17.21", "nzh": "^1.0.8", "socket.io-client": "^4.8.3" "xlsx": "^0.18.5" }, "devDependencies": { "@vue/cli-plugin-babel": "~5.0.0", "@vue/cli-service": "^4.5.15", "@vue/cli-service": "^4.5.19", "ant-design-vue": "^1.7.8", "babel-loader": "^8.1.0", "babel-plugin-dynamic-import-node": "2.3.3", "bootstrap": "^3.3.7", "chalk": "4.1.0", "compression-webpack-plugin": "6.1.2", "concurrent-tasks": "^1.0.7", "connect": "3.6.6", "copy-webpack-plugin": "^5.1.2", "cross-env": "^5.0.5", "less-loader": "^6.1.1", "sass": "1.32.13", "sass-loader": "10.1.1", "script-ext-html-webpack-plugin": "2.1.5", "svg-sprite-loader": "5.1.1", "vue-template-compiler": "2.6.12", "ant-design-vue": "^1.7.8", "babel-loader": "^8.1.0", "bootstrap": "^3.3.7", "concurrent-tasks": "^1.0.7", "copy-webpack-plugin": "^5.1.2", "cross-env": "^5.0.5", "less-loader": "^6.1.1", "uglifyjs-webpack-plugin": "^2.2.0", "vue-ls": "^4.0.0", "vue-ls": "^4.2.0", "vue-template-compiler": "2.6.12", "webpack-cli": "^4.9.1" }, "engines": { @@ -93,4 +93,4 @@ "> 1%", "last 2 versions" ] } } src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -42,7 +42,7 @@ <el-col :span="6"> <el-form-item label="往来单位" prop="HSupName"> <el-input v-model="form.HSupName" placeholder="请输入往来单位" disabled> <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button> <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button> </el-input> </el-form-item> </el-col> @@ -73,7 +73,7 @@ <el-col :span="6"> <el-form-item label="选单号" prop="HMainSourceBillNo"> <el-input v-model="form.HMainSourceBillNo" placeholder="请选择源单" disabled> <el-button slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button> <el-button slot="append" icon="el-icon-search" @click="openDataDialog(11)"></el-button> </el-input> </el-form-item> </el-col> @@ -224,6 +224,8 @@ <el-table-column align="center" label="序号" type="index" width="80" /> <el-table-column align="center" label="源单单号" width="120"> <template slot-scope="scope"> <!-- <el-input v-model="scope.row.HSourceBillNo" placeholder="请选择源单单号" @keyup.native.f7="openDataDialog(6, scope.row)" @dblclick.native="openDataDialog(6, scope.row)" /> --> <span>{{ scope.row.HSourceBillNo }}</span> </template> </el-table-column> @@ -305,9 +307,9 @@ controls-position="right"></el-input-number> </template> </el-table-column> <el-table-column align="center" label="单价" width="120"> <el-table-column align="center" label="单价" width="140"> <template slot-scope="scope"> <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;" <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 120px;" controls-position="right"></el-input-number> </template> </el-table-column> @@ -376,7 +378,7 @@ <el-input v-model="scope.row.HBatchNo" placeholder="请输入批次" /> </template> </el-table-column> <el-table-column align="center" label="采购订单号" width="120"> <!-- <el-table-column align="center" label="采购订单号" width="120"> <template slot-scope="scope"> <span>{{ scope.row.HPOOrderBillNo }}</span> </template> @@ -405,7 +407,7 @@ <template slot-scope="scope"> <span>{{ scope.row.HSeOrderEntryID }}</span> </template> </el-table-column> </el-table-column> --> <el-table-column align="center" label="备注" width="120"> <template slot-scope="scope"> <el-input v-model="scope.row.HRemark" placeholder="请输入备注" /> @@ -430,11 +432,11 @@ <!--业务员--> <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" /> <!--客户--> <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" /> <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" /> <!--仓位-->、 <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" /> <!--选择源单--> <HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" /> <Kf_MoveStockRequestBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID='this.form.HOrgID' v-if="Kf_MoveStockRequestBillShow" /> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="deptClickSub">确 定</el-button> <el-button @click="deptClose">取 消</el-button> @@ -458,10 +460,11 @@ import Material from '@/views/gyMaterial/GyMaterial' import GyCustomer from '@/views/GyCustomer/index' import HSourceReportHtml from '@/views/component/HSourceReportHtml' import Kf_MoveStockRequestBillList from '@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue' export default { name: 'MoveStockBillEdit', components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GyCustomer, HSourceReportHtml, GyStockPlace }, components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, HSourceReportHtml, GyStockPlace, Kf_MoveStockRequestBillList }, props: { OperationType: { type: Number, }, linterid: { type: Number, }, @@ -491,7 +494,7 @@ formHideDataShow: false, //表单隐藏内容标记 formLoading: true, //表单加载遮罩 zzSelDis: false, //组织下拉列表禁用标记 rowHideShow: false, //列设置组件容器显示标记 openRowHide: false, //列设置组件显示标记 @@ -504,7 +507,8 @@ stockPlaceShow: false, //仓位数据组件显示标记 gyEmployeeShow: false, //业务员数据组件显示标记 ScICMOBillShow: false, //源单数据组件显示标记 GyCustomerShow: false, //往来单位数据组件显示标记 gySupplierShow: false, //往来单位数据组件显示标记 Kf_MoveStockRequestBillShow: false, //选择源单数据组件显示标记 deptform: {}, //弹窗选中数据 temp: undefined, //临时变量 @@ -578,6 +582,10 @@ HRemark: "", HManagerName:"", HOrgID: sessionStorage["OrganizationID"] - 0, HSourceBillNo: "", HSourceBillType: "调拨申请单", HSourceInterID: 0, HSourceEntryID: 0, HMaker: sessionStorage["HUserName"], HMakeDate: new Date(), @@ -607,7 +615,6 @@ //新增获取单据号 this.getHBillNo() if (this.OperationType == 1) { this.handleAddSysZb() } this.$nextTick(() => { this.formShow = true @@ -683,7 +690,6 @@ this.form.HSCWHID= data.HSCWHID this.form.HSCWHName= data.调出仓库 this.form.HRemark= data.表头备注 this.form.HSecManagerID= data.HSecManagerID this.form.HSecManagerName= data.验收员 this.form.HKeeperID= data.HKeeperID @@ -694,7 +700,10 @@ this.form.HInnerBillNo= data.内部单据号 this.form.HExplanation= data.HExplanation this.form.HInvoiceBillNo= data.发票编号 this.form.HSourceBillNo= data.HSourceBillNo this.form.HSourceBillType= data.HSourceBillType this.form.HSourceInterID= data.HSourceInterID this.form.HSourceEntryID= data.HSourceEntryID //子表 赋值 var result = response.data.data[1] for (var i = 0; i < result.length; i++) { @@ -783,7 +792,12 @@ //#region 数据弹窗 //#region 打开数据列表弹窗 openDataDialog(num, row) { if (row) { if (num == 11) { this.handleAddSysZb(); this.$nextTick(() => { this.zbIndex = this.editData.length - 1; }); }else if (row) { this.zbIndex = row.index - 1 } this.showReset() @@ -811,9 +825,13 @@ } this.gyEmployeeShow = true this.openData = true }else if (num == 7){ this.dialogTitle = '客户列表' this.gyCustomerShow = true }else if (num == 11){ this.dialogTitle = '调拨申请单列表' this.Kf_MoveStockRequestBillShow = true this.openData = true }else if (num == 6){ this.dialogTitle = '供应商列表' this.gySupplierShow = true this.openData = true } else if (num == 9) { if(this.HSPType==1){ @@ -851,7 +869,8 @@ this.warehouseShow = false this.materialShow = false this.gyEmployeeShow = false this.GyCustomerShow = false this.gySupplierShow = false this.Kf_MoveStockRequestBillShow = false }, //#endregion //#endregion @@ -920,10 +939,59 @@ this.editData[this.zbIndex].HTaxRate = deptRow.默认税率 this.materialShow = false this.openData = false } else if(num == 7){ this.form.HSupName = deptRow.客户名称 }else if (num == 11){ this.form.HSourceBillNo = deptRow.单据号 this.form.HSourceBillType = deptRow.HBillSubType this.form.HSourceInterID = deptRow.hmainid this.form.HSourceEntryID = deptRow.hsubid this.form.HSupName = deptRow.往来单位 this.form.HSupID = deptRow.HSupID this.form.HEmpName = deptRow.业务员 this.form.HEmpID = deptRow.HEmpID this.form.HDeptName = deptRow.部门 this.form.HDeptID = deptRow.HDeptID this.form.HWHName = deptRow.主调入仓库 this.form.HWHID = deptRow.主调入仓库ID this.form.HSCWHName = deptRow.主调出仓库 this.form.HSCWHID = deptRow.主调出仓库ID this.Kf_MoveStockRequestBillShow = false this.openData = false if (this.zbIndex !== null && this.editData[this.zbIndex]) { this.editData[this.zbIndex].HSourceBillNo = deptRow.单据号 this.editData[this.zbIndex].HSourceBillType = deptRow.HBillSubType this.editData[this.zbIndex].HSourceInterID = deptRow.hmainid this.editData[this.zbIndex].HSourceEntryID = deptRow.hsubid this.editData[this.zbIndex].HMaterID = deptRow.HMaterID; this.editData[this.zbIndex].物料代码 = deptRow.物料代码; this.editData[this.zbIndex].物料名称 = deptRow.物料名称; this.editData[this.zbIndex].HUnitID = deptRow.HUnitID; this.editData[this.zbIndex].规格型号 = deptRow.规格型号 this.editData[this.zbIndex].计量单位 = deptRow.计量单位 this.editData[this.zbIndex].HPropertyID = deptRow.HPropertyID this.editData[this.zbIndex].HSecUnitRate = deptRow.换算率 this.editData[this.zbIndex].HQtyMust = deptRow.应收数量 this.editData[this.zbIndex].HQty = deptRow.实收数量 this.editData[this.zbIndex].HPrice = deptRow.单价 this.editData[this.zbIndex].HMoney = deptRow.金额 this.editData[this.zbIndex].HOutPrice = deptRow.调出单价 this.editData[this.zbIndex].HOutMoney = deptRow.调出金额 this.editData[this.zbIndex].HWHID = deptRow.HWHID this.editData[this.zbIndex].HWHName = deptRow.调入仓库 this.editData[this.zbIndex].HSPID = deptRow.HSPID this.editData[this.zbIndex].HWHNumber = deptRow.调入仓库代码 this.editData[this.zbIndex].HSPName = deptRow.仓位名称 this.editData[this.zbIndex].HSCWHID = deptRow.HSCWHID this.editData[this.zbIndex].HSCWHName = deptRow.调出仓库 this.editData[this.zbIndex].HSCWHNumber = deptRow.调出仓库代码 this.editData[this.zbIndex].HSCSPID = deptRow.HSCSPID this.editData[this.zbIndex].HSCSPName = deptRow.调出仓位名称 } } else if(num == 6){ this.form.HSupName = deptRow.供应商名称 this.form.HSupID = deptRow.HItemID this.gyCustomerShow = false this.gySupplierShow = false this.openData = false }else if (num == 9){ if(this.HSPType == 1){ @@ -1078,12 +1146,12 @@ HCostPrice: 0, HCostMoney: 0, HSalePrice: 0, HSeOrderInterID: 741, HSeOrderInterID: 0, HSeOrderEntryID: 18, HSeOrderBillNo: 'XSFH00000747', HSourceInterID: 741, HSourceEntryID: 18, HSourceBillNo: 'XSFH00000747', HSeOrderBillNo: '', HSourceInterID: 0, HSourceEntryID: 0, HSourceBillNo: '', HSourceBillType: 1402, HRelationQty: 0, HRelationMoney: 0, src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -988,6 +988,11 @@ this.formShow = true this.formLoading = false // 加载运输线路、运输类型、车型列表 if (this.form.HContractTransportInterID) { this.loadTransportData() } // 加载已上传的文件列表 this.getFileList(); @@ -1171,12 +1176,11 @@ this.form.HMoney = 0 return } this.form.HContractTransportEntryID = response.data[0].HEntryID this.form.HCarrierID = response.data[0].HSupID this.form.HCarrierName = response.data[0].供应商名称 this.form.HCurID = response.data[0].币别 this.form.HCurName = response.data[0].货币名称 this.form.HExRate = response.data[0].汇率 == null ? 0 : response.data[0].汇率 this.form.HExRate = response.data[0].汇率 == null ? 0 : response.data[0].汇率 - 0 this.form.HSSID = response.data[0].结算方式 this.form.HSSName = response.data[0].结算方式名称 this.transportList = [...new Set(response.data.map(item => item.运输路线名称))] @@ -1497,6 +1501,7 @@ var sSubStr = JSON.stringify(this.editData); // var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType; var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] console.log(sMainSub) axios({ method: 'post', url: this.baseURL + "/WLYayBillController/SaveBill", @@ -2091,6 +2096,44 @@ }); }, // 加载运输相关数据 loadTransportData() { axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', { params: { "hmainid": this.form.HContractTransportInterID, }, }).then(res => { let response = res.data if (response.code == 1) { // 运输线路去重 this.transportList = [...new Set(response.data.map(item => item.运输路线名称))] // this.$nextTick(()=>{ // }) this.getTransCost('line') this.getTransCost('type') this.getTransCost('car') // // 运输类型去重 // this.transTypeList = [...new Set(response.data.map(item => item.运输类型))] // // 车型去重 // const carTypeMap = new Map() // response.data.forEach(item => { // const key = item.运输方式名称 // if (!carTypeMap.has(key)) { // carTypeMap.set(key, { value: item.运输方式名称, id: item.运输方式 }) // } // }) // this.HCarTypeNameList = Array.from(carTypeMap.values()) } else { this.$modal.msgError("错误:" + response.data.code + response.data.Message); } }).catch(error => { this.$modal.msgError("接口请求失败!"); }); }, // 获取已上传文件列表 getFileList() { }, @@ -2119,16 +2162,51 @@ transLineNameChange() { this.form.HTransType = '' this.form.HCarTypeName = '' this.form.HCarTypeID = 0 this.form.HContractTransportEntryID = 0 this.form.HBeginAddrName = '' this.form.HBeginAddr = 0 this.form.HEndAddrName = '' this.form.HEndAddr = 0 this.form.HCarTypeMaxVolume = 0 this.form.HDistance = 0 this.form.HTransportTimes = '' this.form.HTransportTyep = '' this.form.HMoney = 0 this.transTypeList = [] this.HCarTypeNameList = [] this.getTransCost('line') }, transTypeChange() { this.form.HCarTypeName = '' this.form.HCarTypeID = 0 this.form.HContractTransportEntryID = 0 this.form.HBeginAddrName = '' this.form.HBeginAddr = 0 this.form.HEndAddrName = '' this.form.HEndAddr = 0 this.form.HCarTypeMaxVolume = 0 this.form.HDistance = 0 this.form.HTransportTimes = '' this.form.HTransportTyep = '' this.form.HMoney = 0 this.HCarTypeNameList = [] this.getTransCost('type') }, transHCarChange() { transHCarChange(val) { this.form.HContractTransportEntryID = 0 this.form.HBeginAddrName = '' this.form.HBeginAddr = 0 this.form.HEndAddrName = '' this.form.HEndAddr = 0 this.form.HCarTypeMaxVolume = 0 this.form.HDistance = 0 this.form.HTransportTimes = '' this.form.HTransportTyep = '' this.form.HMoney = 0 let item = this.HCarTypeNameList.find(item => item.id === val); this.form.HCarTypeName = item.value this.form.HCarTypeID = val this.getTransCost('car') }, checkAndCallGetTransCost() { @@ -2185,11 +2263,12 @@ }) this.HCarTypeNameList = Array.from(carTypeMap.values()) } else if (val == 'car') { this.form.HContractTransportEntryID = response.data[0].HEntryID this.form.HBeginAddrName = response.data[0].始发地名称 this.form.HBeginAddr = response.data[0].始发地 this.form.HEndAddrName = response.data[0].目的地名称 this.form.HEndAddr = response.data[0].目的地 this.form.HCarTypeMaxVolume = response.data[0].车辆最大容积 this.form.HCarTypeMaxVolume = response.data[0].车型最大容积 this.form.HDistance = response.data[0].距离 this.form.HTransportTimes = response.data[0].运输时效 this.form.HTransportTyep = response.data[0].运输类型 src/views/logistics/transportGPS/WL_YayBill.vue
@@ -788,9 +788,9 @@ this.sWhere += " and 物流状态 like '%" + this.queryParams.HBillStatus + "%'"; } // if (this.queryParams.HOrgID) { // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'"; // } if (this.queryParams.HOrgID) { this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'"; } console.log("swhere", this.sWhere) this.clearData() this.getList() src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
@@ -227,6 +227,9 @@ export default { name: 'Kf_MoveStockRequestBillList', components: { RowSettings, Edit, PrintList }, props: { openPage: { type: String }, }, data() { return { HModName: "Kf_MoveStockRequestBillList", @@ -279,6 +282,10 @@ lastSelectedRow: null, // 上一次选中的行 selectedRow: null, // 当前选中的行 rowForm: {}, dialogTypeNum: null, deptform: {}, //弹窗选中数据 openData: false, //数据弹窗 dialogTitle: "", // 弹出层标题 title: "", // 是否显示弹出层 @@ -606,6 +613,9 @@ this.selectedRow = row; // 记录当前选中的行 this.lastSelectedRowIndex = this.tableData.indexOf(row); this.$refs.tableData.toggleRowSelection(row); if (this.openPage) { this.$emit("deptEmit", row, 11); } }, //选中行高亮样式 rowStyle({ row, rowIndex }) { @@ -613,10 +623,33 @@ return { "background": "#ecf5ff" } } }, dbEmitData(deptRow, num) { // num=1部门 num=2出库仓库 if (num == 11){ this.editData[this.zbIndex].HSourceBillNo = deptRow.单据号 this.editData[this.zbIndex].HSourceBillType = deptRow.HBillSubType this.editData[this.zbIndex].HSourceInterID = deptRow.hmainid this.editData[this.zbIndex].HSourceEntryID = deptRow.hsubid this.gyCustomerShow = false this.openData = false } }, emitData(deptRow, num) { this.dialogTypeNum = num; this.deptform = deptRow; }, deptClickSub() { this.dbEmitData(this.deptform, this.dialogTypeNum) this.deptform = {} }, //双击行 handleDblclick(row, column, cell, event) { this.OperationType = 3 this.handleEdit() if (this.openPage) { this.$emit("deptEmitDb", row, 11); } else { this.handleEdit(row); } }, // 多选框选中数据 handleSelectionChange(selection) {
