diff --git a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue index ac8344d8..c1788aaf 100644 --- a/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue +++ b/sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue @@ -92,7 +92,7 @@ size="mini" @click="handleAdd" v-hasPermi="['system:role:add']" - >保存 + >新建 - + @@ -126,15 +126,16 @@ - + + @@ -145,7 +146,7 @@ - + @@ -155,15 +156,16 @@ - + + @@ -306,7 +308,7 @@ export default { //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system - // uploadUrl:'http://10.40.92.140:9201',//本地测试 + // uploadUrl:'http://192.168.5.12:9201',//本地测试 dialogImageUrl: '', dialogVisible: false, //-------------- @@ -376,6 +378,7 @@ export default { }, // 取消按钮 cancel() { + this.open = false; this.reset(); }, @@ -389,7 +392,8 @@ export default { inputNum: undefined, checkUrl: undefined, }; - // this.resetForm("form"); + this.imageUrl = '' + this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -584,6 +588,7 @@ export default { param.type = 'ma' imgUpLoad(param).then(res => { if(res.code == 200) { + this.imageUrl = res.data.fileUrl; if(this.open){ this.form.checkUrl = res.data.fileUrl; this.form.checkUrlName = res.data.fileName; diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue index 86afa1c7..84d99b48 100644 --- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue +++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue @@ -104,7 +104,7 @@ - + @@ -331,9 +331,10 @@ export default { this.form = row; this.$set(this.form,'str','') this.$set(this.form,'str1','') - this.$set(this.form,'fixCode','1') + // this.$set(this.form,'fixCode','1') let arr = this.form.arrivalTime.split('-') - this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1]; + // this.form.exCode = ; + this.$set(this.form,'exCode','NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1]) this.form.count = row.checkNum; this.codeList=[] this.open = true; @@ -382,7 +383,7 @@ export default { if(sum>this.form.checkNum){ this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量，请调整后缀范围。"); }else{ - if(num1>num){ + if(num1=>num){ for(let i = 0; i < count; i++) { let obj = { typeName:this.form.typeName, @@ -395,7 +396,7 @@ export default { } this.codeList.push(obj) } - }else{ + } else{ this.$modal.msgError("编码后缀范围输入格式不正确"); } } diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue index d01f187f..2d42aa43 100644 --- a/sgzb-ui/src/views/store/tools/devices.vue +++ b/sgzb-ui/src/views/store/tools/devices.vue @@ -94,18 +94,14 @@ - - - - - + - + diff --git a/sgzb-ui/src/views/store/tools/toolsSupplier.vue b/sgzb-ui/src/views/store/tools/toolsSupplier.vue index 5bf6e231..11919465 100644 --- a/sgzb-ui/src/views/store/tools/toolsSupplier.vue +++ b/sgzb-ui/src/views/store/tools/toolsSupplier.vue @@ -84,7 +84,7 @@ @@ -148,15 +148,16 @@ - + + @@ -219,7 +220,7 @@ export default { //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system - // uploadUrl:'http://192.168.4.2:9201',//本地测试 + // uploadUrl:'http://192.168.5.12:9201',//本地测试 // 表单校验 rules: { dictName: [ @@ -297,6 +298,7 @@ export default { const supplierId = row.supplierId || this.ids getSupplierInfo(supplierId).then(response => { this.form = response.data; + this.imageUrl = this.form.businessLicense this.open = true; this.title = "编辑"; }); diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue index 93527037..0b1c5678 100644 --- a/sgzb-ui/src/views/store/tools/toolsType.vue +++ b/sgzb-ui/src/views/store/tools/toolsType.vue @@ -275,14 +275,15 @@ :http-request="(obj) => imgUpLoad(obj,'fileUrl')" action="#" :file-list="fileList" + list-type="picture-card" :show-file-list="false" - accept=".png,.jpg,.jpeg" + accept=".png,.jpg,.jpeg" :on-success="handleAvatarSuccess" :on-preview="handlePictureCardPreview" :on-remove="handleRemove"> - 上传 + - + @@ -455,8 +456,8 @@ export default { field101fileList:[], //上传地址 // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system - // uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system - uploadUrl:'http://192.168.5.12:9201',//本地测试 + uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system + // uploadUrl:'http://192.168.5.12:9201',//本地测试 defaultProps: { children: "children", label: "label" @@ -639,17 +640,13 @@ export default { const typeId = row.typeId || this.ids; getMaType(typeId).then(response => { this.form = response.data; - // let file = { - // name:this.form.documentName, - // type:this.form.documentUrl, - // } - // this.field101fileList.push(file) - // let img = { - // name:this.form.photoName, - // type:this.uploadUrl+this.form.photoUrl, - // } - // this.fileList.push(img) - + let file = { + name:this.form.documentName, + type:this.form.documentUrl, + } + this.field101fileList.push(file) + + this.imageUrl = this.form.photoUrl this.open = true; this.title = "修改"; }); diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 25879ff8..abfe2747 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -36,9 +36,9 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { //192.168.0.14 - // target: `http://112.29.103.165:21624`,//线上环境 + target: `http://112.29.103.165:21624`,//线上环境 // target: `http://192.168.0.14:21624`,//线上环境 - target: `http://192.168.5.12:8080`,//丁 + // target: `http://192.168.5.12:8080`,//丁 // target: `http://10.40.92.138:8080`,//丁/ // target: `http://10.40.92.126:8080`,//高 // target: `http://10.40.92.111:8080`,//亮