2 Commits 659693dbf6 ... d90242523d

Author SHA1 Message Date
  shanbinzhang d90242523d Merge branch 'need_pool291' into debug 1 week ago
  shanbinzhang 2322c58b54 fix 1 week ago

+ 1 - 1
pages-approve/components/approveListItem.vue

@@ -5,7 +5,7 @@
 			<view>{{data.title}}</view>
 		</view>
 		<view class="message-content">
-			<view class="info">归属公司:{{data.AffiliatedCompany}}</view>
+			<view class="info">归属公司:{{data.AffiliatedCompany||""}}</view>
 			<view class="info">申请销售:{{data.saller}}</view>
 			<view class="info">
 				<text>申请类型:{{data.applyType}}</text>

+ 7 - 2
pages-approve/seal/addSeal.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="add-page white-wrap" @click="handleClickPage">
 		<view class="section white-wrap">
-			<view class="section-title require">归属公司</view>
+			<view class="section-title require">归属公司
+				<span class="tip">(归属公司:申请用章公司)</span>
+			</view>
 			<view class="section-select-box" :style="{color:belongCompany?'#333':'#999'}" @click="showBelongCompanyPop=true">{{belongCompany?belongCompany:'请选择'}}</view>
 		</view>
 		
@@ -219,7 +221,6 @@
 				this.UseCompanyName=e.ContractBusinessType=='代付合同'?e.UseCompanyName:e.CompanyName
 				this.ContractId=e.ContractId
 				this.ContractfileUrl=e.FileUrl
-				this.belongCompany=e.AffiliatedCompany
 				// 关闭搜索弹窗
 				this.showCustome=false
 				this.searchCustomeVal=''
@@ -398,6 +399,10 @@
 		.section-title{
 			font-size: 16px;
 			margin-bottom: 20rpx;
+			.tip {
+				font-size: 12px;
+				color: #999;
+			}
 		}
 		.require::before{
 			content: '*';

+ 7 - 1
pages-approve/seal/detail.vue

@@ -2,7 +2,9 @@
 	<view class="detail white-wrap">
 		<image :src="statusImg" mode="aspectFill" class="status-img" v-if="statusImg"></image>
 		<view class="section white-wrap">
-			<view class="section-title require">归属公司</view>
+			<view class="section-title require">归属公司
+				<span class="tip">(归属公司:申请用章公司)</span>
+			</view>
 			<view :class="opButton.CheckEdit?'section-select-box':null" :style="{color:belongCompany?'#333':'#999'}" @click="handleOperation('showPurpose')">{{belongCompany?belongCompany:'请选择'}}</view>
 		</view><view class="section white-wrap">
 			<view class="section-title require">用印用途</view>
@@ -902,6 +904,10 @@
 				-webkit-background-clip: text;
 				background-clip: text;
 			}
+			.tip {
+				font-size: 12px;
+				color: #999;
+			}
 		}
 		.require::before{
 			content: '*';

+ 7 - 2
pages-approve/seal/edit.vue

@@ -1,7 +1,9 @@
 <template>
 	<view class="add-page white-wrap">
 		<view class="section white-wrap">
-			<view class="section-title require">归属公司</view>
+			<view class="section-title require">归属公司
+				<span class="tip">(归属公司:申请用章公司)</span>
+			</view>
 			<view class="section-select-box" :style="{color:belongCompany?'#333':'#999'}" @click="showBelongCompanyPop=true">{{belongCompany?belongCompany:'请选择'}}</view>
 		</view>
 		
@@ -275,7 +277,6 @@
 				this.ServiceType=e.ContractType
 				this.UseCompanyName=e.ContractBusinessType=='代付合同'?e.UseCompanyName:e.CompanyName
 				this.ContractId=e.ContractId
-				this.belongCompany=e.AffiliatedCompany
 				// this.ContractfileUrl=e.FileUrl
 				this.handleFile([e.FileUrl])
 				// 关闭搜索弹窗
@@ -432,6 +433,10 @@
 		.section-title{
 			font-size: 16px;
 			margin-bottom: 20rpx;
+			.tip {
+				font-size: 12px;
+				color: #999;
+			}
 		}
 		.require::before{
 			content: '*';

+ 1 - 1
pages-todomessages/list/list.vue

@@ -61,7 +61,7 @@
                         <view class="info">修改时间:{{item.CreateTime|formatTime}}</view>
                      </view>
                      <view v-else>
-                     <view class="info">归属公司:{{item.AffiliatedCompany}}</view>
+                     <view class="info" v-if="type===3">归属公司:{{item.AffiliatedCompany}}</view>
                      <view class="info">申请销售:{{item.ApprovalInfo.ApplyName}}</view>
                      <view class="info" v-if="item.statusName==='待审批'">提交时间:{{item.ApprovalInfo.ApplyTime|formatTime}}</view>
                      <view class="info" v-else>审批时间:{{item.ApprovalInfo.ApprovalTime|formatTime}}</view>