Skip to content

H
hls-xcmg-vue-app
Commit eca98b12 authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

合并代码

parents 5aa51f71 bd6801eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 71 deletions
config/uat.env.js
View file @ eca98b12
......@@ -11,5 +11,5 @@ module.exports = {
ocrPath:'"http://180.104.121.66:8088/r/api"',
fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
appId: '"com.xcmg.app.dev"',
currentVersion: '"2.6.2"'
currentVersion: '"2.6.6"'
}
src/pages/contractCreate/create-base-info.vue
View file @ eca98b12
......@@ -172,6 +172,14 @@
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" />
</item>
<item v-if="fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" readonly placeholder="" >
</item>
<item v-if="!fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" placeholder="请输入" >
</item>
<item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
......@@ -319,6 +327,14 @@
<img v-if="checked" slot="content" src="@/assets/contractCreate/selected.png" >
<span v-if="!checked" slot="content" />
</item>
<item v-if="fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" readonly placeholder="" >
</item>
<item v-if="!fromPutted">
<div slot="name">合同补充条款</div>
<input slot="content" v-model="saveInfo.contract_supplementary_file" placeholder="请输入" >
</item>
<item v-if="!fromPutted&&showSpecialFlag&&project_status==='REJECT'" class="check" @click.native="checkedApproved=!checkedApproved">
<div slot="name" class="required">是否特批</div>
<img v-if="checkedApproved" slot="content" src="@/assets/contractCreate/selected.png" >
......
src/pages/contractCreate/sales-info.vue
View file @ eca98b12
......@@ -221,7 +221,7 @@ export default {
vm.inflow_used = '' // 已使用授信额度
vm.inflow_reset = '' // 剩余授信额度
vm.user_bp_type = window.localStorage.bp_type
vm.sales = window.localStorage.bp_name
// vm.sales = window.localStorage.bp_name
vm.multiple = window.localStorage.multipleRole
// {
// "bp_id_tenant":"8964",
......
src/pages/productQuery/entity-list.vue
View file @ eca98b12
......@@ -30,6 +30,8 @@
<div slot="content" class="item-content">
<div class="pro-name">
<p>{{ item.product_name }}</p>
<span>办事处：{{ item.bp_name }}</span><br>
<span>产品型号：{{ item.product_code }}</span>
</div>
</div>
<img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
......@@ -273,17 +275,17 @@ export default {
width: 100%;
margin-left: 20px;
.pro-name {
height: 42px;
width: 90%;
position: relative;
p {
height: 42px;
line-height: 42px;
height: 36px;
line-height: 36px;
font-family: PingFangSC-Semibold;
font-size: 15px;
color: #4B4A4B;
letter-spacing: 0;
font-weight: 600;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
}
}
.centers {
......
www/index.html
View file @ eca98b12
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.21cb7156819074159aa9d1a495e4c824.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.0a4e11017ea45af58444.js></script><script type=text/javascript src=./static/js/app.d68c1669329a2605172e.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.21cb7156819074159aa9d1a495e4c824.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.0a4e11017ea45af58444.js></script><script type=text/javascript src=./static/js/app.d68c1669329a2605172e.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.78435f9c748840b587c68e5ff0674abe.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.d1d652612de8a132d4e5.js></script><script type=text/javascript src=./static/js/app.2f217eda99a2e9b0949d.js></script></body></html>
>>>>>>> bd6801eb470716e53e6e672ef73511511d752666
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment