diff --git a/.env.development b/.env.development index 8669cbf..c388d6e 100644 --- a/.env.development +++ b/.env.development @@ -1,16 +1,16 @@ # just a flag ENV='development' -#VUE_APP_BASE_API = http://192.168.60.99:8004/ -#VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file +VUE_APP_BASE_API = http://192.168.60.99:8004/ +VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file #VUE_APP_OA_URL= http://192.168.60.18:8001 #VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}' #正式 -VUE_APP_BASE_API = http://192.168.60.99:9004/ -VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file +#VUE_APP_BASE_API = http://192.168.60.99:9004/ +#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file # 正式oa VUE_APP_OA_URL = http://192.168.60.18:2021 diff --git a/public/print.html b/public/print.html index 364d546..9fadc0e 100644 --- a/public/print.html +++ b/public/print.html @@ -64,6 +64,7 @@ ""+ "
"+ "

类别:"+printObj['material_info_type']+"

"+ + "

物资名称:"+printObj['zichanmingcheng']+"

"+ "

规格:"+guige+"

"+ "

型号:"+xinghao+"

"+ "

批次:"+printObj['rukupici']+"数量:"+printObj['total_num']+"

"+ diff --git a/src/views/inventorys/index.vue b/src/views/inventorys/index.vue index fa710ff..4b6cc11 100644 --- a/src/views/inventorys/index.vue +++ b/src/views/inventorys/index.vue @@ -287,7 +287,7 @@ prop: 'zaikushuliang', customFn: (row) => { console.log("row",row) - return ({row.row.zaikushuliang}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}) + return ({row.row.total_num}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}) } }, { diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue index 43aa7f6..69b5b26 100644 --- a/src/views/outbounds/component/addoutbounds.vue +++ b/src/views/outbounds/component/addoutbounds.vue @@ -89,10 +89,10 @@ @@ -113,7 +113,7 @@ *经办人:
- +
@@ -136,7 +136,7 @@