diff --git a/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js b/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js
index 40290c6b..62294d30 100644
--- a/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js
+++ b/src/assets/i18n/langs/cn/companyAdmin/extendInfo.js
@@ -19,6 +19,9 @@ export default {
editProjectFormRules: {
contractPrice: [
{ required: true, message: "请输入合同额", trigger: "change" },
+ ],
+ investmentPrice: [
+ { required: true, message: "请输入投资额", trigger: "change" },
],
contractSignTime: [
{ required: true, message: "请选择合同签订日期", trigger: "change" },
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 6778e31c..1d5eb6a7 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -84,10 +84,10 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
- axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+ // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
- // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
+ axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
diff --git a/src/store/index.js b/src/store/index.js
index 959b3c00..dfb93d52 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -52,26 +52,26 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
- UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
- FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
- WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
+ // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+ // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+ // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
- // BASEURL: baseUrl
- // ? baseUrl
- // : window.location.protocol + "//" + window.location.host + "/", //正式环境
- // UPLOADURL:
- // window.location.protocol +
- // "//" +
- // window.location.host +
- // "/upload/image", //正式环境
- // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+ BASEURL: baseUrl
+ ? baseUrl
+ : window.location.protocol + "//" + window.location.host + "/", //正式环境
+ UPLOADURL:
+ window.location.protocol +
+ "//" +
+ window.location.host +
+ "/upload/image", //正式环境
+ FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
- // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
+ WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
diff --git a/src/views/projectFront/materialManage/materialEntryManage.vue b/src/views/projectFront/materialManage/materialEntryManage.vue
index 58d9d5ce..c4ca8a96 100644
--- a/src/views/projectFront/materialManage/materialEntryManage.vue
+++ b/src/views/projectFront/materialManage/materialEntryManage.vue
@@ -77,6 +77,11 @@
align="center"
label="批次"
>
+
+
{{ $t("message.extendInfo.investmentPrice") }}
- {{ projectDetail.contractPrice }}
+ {{ projectDetail.investmentPrice }}
@@ -187,6 +187,25 @@
:placeholder="$t('message.extendInfo.pleaseEnter')"
> -->
+
+
+
+