admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug，添加材料进出场车牌号

Browse Source
This commit is contained in:
Vce 2024-05-25 22:04:07 +08:00
parent 49c57ab8a0
commit 467014a475
6 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/i18n/langs/cn/companyAdmin/extendInfo.js
View File

@ -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" },

4
src/assets/js/http.js
View File

@ -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/' // 百色三标段项目

26
src/store/index.js
View File

@ -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

5
src/views/projectFront/materialManage/materialEntryManage.vue
View File

@ -77,6 +77,11 @@
align="center"
label="批次"
></el-table-column>
<el-table-column
prop="carNumber"
align="center"
label="车牌号"
></el-table-column>
<el-table-column
prop="entryTime"
align="center"

5
src/views/projectFront/materialManage/materialExitManage.vue
View File

@ -77,6 +77,11 @@
align="center"
label="批次"
></el-table-column>
<el-table-column
prop="carNumber"
align="center"
label="车牌号"
></el-table-column>
<el-table-column
prop="entryTime"
align="center"

22
src/views/projectFront/projectSummary/extendInfo.vue
View File

@ -29,7 +29,7 @@
<span class="width_35">
{{ $t("message.extendInfo.investmentPrice") }}
</span>
<span class="width_65">{{ projectDetail.contractPrice }}</span>
<span class="width_65">{{ projectDetail.investmentPrice }}</span>
</div>
<div class="flex3">
@ -187,6 +187,25 @@
:placeholder="$t('message.extendInfo.pleaseEnter')"
></el-input-number> -->
</el-form-item>
<el-form-item
:label="$t('message.extendInfo.investmentPrice')"
prop="investmentPrice"
>
<el-input
type="number"
@change="checkValue()"
v-model="editProjectForm.investmentPrice"
placeholder="请输入数字类型"
></el-input>
<!-- <el-input-number
type="number"
@change="checkValue()"
style="width: 100%"
v-model="editProjectForm.contractPrice"
:min="0"
:placeholder="$t('message.extendInfo.pleaseEnter')"
></el-input-number> -->
</el-form-item>
<el-form-item
:label="$t('message.extendInfo.contractSigning')"
prop="contractSignTime"
@ -372,6 +391,7 @@ export default {
projectOverview: "",
educationId: "",
contractPrice: "",
investmentPrice: ""
},
educationList: [],
editProjectFormRules: this.$t("message.extendInfo.editProjectFormRules"),